Finished tests
Cleaned up some of the tests
Merge remote branch 'upstream/master'