Updated all test cases, minor fix to test suite ordering, minor additions to some classes