first two tests fixed