cleaned up some of the intermixed test case