better test name
first bit of the massive shakeup