More tests, less commented code