Oops I pushed prematurely
Will wanted better tests