Added a unit test, though it is incomplete