Remove deprecated argument to RSpec::Mocks.setup

This also appeared to be causing certain test-unit tests to hang.

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Remove superfluous begin in test_helper #teardown

Signed-off-by: Alex Coles <alex@alexbcoles.com>