More Data layer commits

Removed a few of the test strings and added some mock DB data to be
requested.