Fixed three failing tests