Added more tests, fixed bugs