Prep for pub update, unit test conversion to future based tests, testing bugs.