Updated test cases and some of the class files (commenting puts).