Fix AppVeyor builds

The class imports were incorrect, and tests were failing on AppVeyor.