paring down/fixing tests for now, until we can tackle updating them