Extend adprep unitest