added two tests, removed one