Fixed JUnits so that they pass again