Revert "Get some tests passing"

This reverts commit 46cffa917c5d76c13cc233f006bf15c7c16fc74a.
Tests passing