Get tests passing, if not slowly