All tests working again