fixed most bugs, two tests still failing
fixed test user
Merge pull request #12 from meara/db_and_test_fixes

fixed most bugs, two tests still failing