Merge pull request #5 from garciafl/testScott

DAO and Service layer compatible