More preparation for mob dev test part 2