Merge "Change test to use unittest for integration into treehugger"