more inconsistency fixes and tests