Refactored the new scopes to make testing scoped beans easier.