re-work tests to match new functionality