WOrking on test cases.