Fixed two unit tests