Fixed unit test. Removed some commented out code.