fixes #58: corrected imports, and added associated unit test