Fixed a misplaced line of test code, more comments

+ Deleted some code