Added more tests (but they are failing)