Fixed issue #21 Move test cases across test suites