refactoring, consistency

(now tests fial that should have failed in the first place?!)