Merge test content into master

Merging test directory content into master to ensure that the latest round of tests are easily accessible.