fixed unittest files according to trial standard