removed un-appropriately named class and moved tests to where they belong