Added more tests, one still failing because of a bug