Better test syntax
Added ability to remove existing files