Test cases fixed

all tests work