forgot to commit weeks ago
Fixed merge that for some reason git could not figure out.  Derpa derp.
Minor merge and removal of some tests pending refactor and re-addition of alternate tests.
Pushing to master from korovyovyvyvyvyvv.
Fixed the conflict.