Fixed two tests