Fix tests - errors removed, some warnings remain