Moved Album classes into a separate namespace and added a few more tests