Removes testing deprecations

Also some reformating
Merge branch 'remove_test_deprecations'

Conflicts:
	spec/support/shared_handler_example.rb