Improve asserts (messages), more careful testing