Removed unnecessary property nesting from returned objects.
Updated server-side unit tests inline with recent refactors.