moved test to correct file and cleaned it up