changed to what & when fields, tests failing