update tests with things more broken up