Fixed unstable test (issue with different behaviour depending on JDK and OS version).

- reorganised imports
- added sorting (list of albums) before asserting
- reordered the asserts
Fixed unstable test (issue with different behaviour depending on JDK and OS version).

- reorganised imports
- splitted assert of JSON into multiple asserts to avoid problems with the order of the attributes in the JSON string
Merge pull request #6 from McPringle/master

Fixed unstable test (issue with different behaviour depending on JDK)