Album Arrangement

- [x] Attempt to fix child album listing issue
- [x] Fix tests