This needs an acceptance test to clearly display what we are fixing.