handling of albums updated + more tests added