Updated unit tests to conform with latest Affix release.

Also fixed a few obvious import / module name problems.