Revert "fixing broken build, gg half-implemented changes"

This reverts commit 3e953cd495cccda48835b8610e2f1628a78f15eb.
Revert "Revert "Remove some unittest files that broke the build.""

This reverts commit d961b24da45b52ca9df585cb099668754c1151fb.