More fixed tests
Merge remote-tracking branch 'upstream/pm' into pm

Conflicts:
	spec/balanced/resources/bank_account_spec.rb