Removed some test cases
Merge branch 'pt74353630' into develop