morphology fix, more tests