Fixed failing junits.