finishing up some testcases