wip

Conflicts:
	test/support/models/fake_test_record.rb
	test/support/schema.rb