Added Tests
Fixed return type error in DAL