Always run tests before check-in. Also, refactored.