Fix unit tests #13