Added more tests and refactored structure of tests.