Tidied up Test projects