Add some tests and fix names of tests