Fixes #90

Also remove an unused and duplicate import from that file and the
redundant `test_suite` declaration from the test file. There was also
a duplicate method definition in the test file that was removed.