Fixed import problems
Support hybrid properties (non_album_songs)
Updated tests to use numberic IDs
Somehow moving the relationship to artist fixes non_album_songs