Tests fix

Fix tests (too permissive + errors in test case generation)