Add test case for the poc fixes