Add more tests (many are failing)