Updated test cases with those which now pass.