Added new sample data
Renamed test packages. Updated tests to no longer need inbuilt test server