Unify assert method argument order.
Update tests for new assert order.
Rename remaining tests
Keep the former methods around.
Make PHPCS happy
Merge pull request #4206 from dereuromark/3.0-assert

3.0 Consistent asserts in TestSuite