moved properties to the correct location
moved test controller to correct location