Added more tests. Passing 42/43