closes #4644 - Switch from using blanket to istanbul - Rename some test files for consistency (and so that they will run)