added a todo
adjusted relationship_spec and relationship_type_spec to match rspec best practices
more test adjustments. Model tests more or less finished (some open tests in actor_spec)
small adjustments at whitelist_scope_spec
Merge branch 'master' into tests_iter4