Merge pull request #72 from Trott/millennium

refactor test