improving tests according review comments