Tidied up test folders and project test config