Genre calc spec refactored

Added a few more meaningful tests. Still need to test the get_genres method!