Removing duplication in commits and collector specs

Does a few things:

* Removes use of `File::Separator` and string splitting in favor of simple `File.basename` standard.
* Removes duplication of specs.
* Removed extra `subject` declarations.
* Promoted local variables to proper `let` methods.