two tests rewritten - squash then