cleanup of tests to match code