Added Album parameter and a unit test of sorts