Fixed output for test and did some clean up