full build now passes
one last fix for tests.