Finish streamlining tests