Code style fixes.
Updated tests to work with latest BedREST service changes.