Adjusted entity classes to reflect new db structure, added tests package to test DAO