Fixed first two tests described by assignment.