streamlining unit tests