Fix #15 fix the unit tests to go with this