Two minitest
Added by Erin and Wei
Merge branch 'Team_dev'

Merge From Team_dev