Changes in Tests and renaming of dao package