Tests all passing with high scores now