SOme fixed for the testcases to work with the new code