refactor: all service specs now use shared specs
enhanced: Utils.makeSelectable is now more abstract
refactor: small refactors