Adding an album model
Fixing the build and tests