Rename test directory to be more consistent