Fix #143, updating unit tests