Corrected database.yml
Completed 6.1 -- added new test and helper