Adding isEmpty plus test