Remove debugging code and FIXME statement since the tests now passes on jenkins