White space
Updated service repo and tests
Refactored spaces repo
Refactored service broker repo and tests