More preparation for unittest