mark - moved tests around. simplified cfunits test.