Add an output directory.
Cleanup.
Add testing files from @shorlander!