Changed tests to always output to a directory to avoid clutter
Getting rid of unused files