Improve Tests (issue #33)

I rearranged these tests and wrote a failing test for orphan purging. Figured it's better to just pull request these changes and fix the orphan album stuff in another. Let me know what you think.