tests passing again