Added Education, changed tests