Added albums and fixed tests.