added two tests back