[#349][WIP] modify tests