OPENUCB-347: Tests passing on develop

This includes changes to the dev makefile to pull in patches to panopoly_test that are required to get the suite to pass. Also moving the test directory, adding test files for upload purposes, and tweaking OB-specific tests. 

The patches should be non-controversial in panopoly_test - once they're committed the makefile can just be pointed to the updated hash.