Tidied up spec/ directory