More tests, some are failing