Updated prototype tests