Merged test case from master