Switch to use album/artist IDs for primary id

Additionally revamped tests to some degree