Tweaking some test cases