straightening up tests so far