Got rid of incorrect placement of test code.