Add test case plus make changes so test case runs