new tests, i think we're almost done