Added more tests, fixed bugs and added 27 and 33