Updated Database and Test Functions

New database design, new test data for functions to use