Cleanup. Added test data.