Cleanup and added another testcase