Get test suite to build correctly; next step is to rewrite tests