expand validation and fix tests