improve peppertag tests + fixes