Re-organise schema test specs and the test spec to detail the path of the tests