ironed out entities and got unit tests for songdao to pass with test db