Major update
Fix tests