Renamed test packages so eclipse can filter the tests