Improved testcases for JModel legacy classes (Fix #4807)
Removed or fixed 'risky' tests (Fix #4805)
Move legacy JModel tests to match directory structure