Split output file and directory arguments
Clean up binary tests