Fixes small issues with testcases
