continuing to revamp associated tests