re-introduce test cases
fix