Minor usecase and junit change