Removed the test data.
Moved some stuff to the service layer and did some refactoring.
ID with upper case looks nicer - no matter what the style guide says.
Refactoring and general review.