fix up errors, bring back all tests