revised Test & Go