Fix wrong assertion
Fix tests