Added tests from other students
Update
Merged tests again