Moved droned_opts to config tests
Updates to test config, and standardise tests overall