Made the code for testing functions only run if it's called directly, not when imported as a module.
Merge branch 'SDAMcIntyre-master'
added code so test doesn't execute on import, only executes if run the file by itself