Slightly closer to getting all tests