Removing test directory
Merge branch 'master' into thing_spec