Final test
Fix tests