Revert "Remove some unittest files that broke the build."

This reverts commit 7cfd9692dabc181d3d325a40db4ff497622004fe.
fixing broken build, gg half-implemented changes