chipping away at functional tests