Filled in tests
Merge branch 'MoreTests' into dev