Updated test suite and added test cases.
Merge branch 'test_suite' into develop