Changed structure to separate out the tests and scripts.