Two fixed from test failures in the base tests. Base tests now all pass.