[fix] various fixes after tests