Working on a few test cases.