Added more tests, fixed indentation in a file