master: fix test and packages