Updated Tests, etc.