Added more tests. Some are failing