Config and basic tests created
merged from develop, all tests passing