Don't use reply specific funcs
Added some initial custom UTs (broken)