Updated prototypes
Added first failing test for new prototypes