Fix missing test
Fix tests