Issue #11 Fix broken unit tests