Test cases fixed

Stuff