working on rewriting tests