Added test cases, whitespace