only one annoying test left to resolve!