Added two tests according to review comments