remove commented out code, improve test code