Remove unnecessary test returns (again!)

These were just cleaned up, and here someone has gone and reintroduced
them again! What gives!