More tests, strictness bugfix