Album Arrangement

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