basic tests passing again