#6, Fix tests