fixed the tests
added testmethods to needsModelTest
Merge branch 'Dev' into testing
mergefix
Merge branch 'Dev' into Database_fixes