(PUP-716) Change more tests after refactoring

This also fixes the spec_helper which had a reference to
FileSystem::File