Modified DAO's and BaseTest