Changed testing directory structure a bit.