Merge branch 'tests' into 'master'

Review Tests for Project 6

Closes #2, #3, #6, #8, #9, #10, #11, and #12

See merge request !1