Rebuilt as tests were failling