Re-organizing internal api. Adding tests for album api methods