clean up lint warnings from travis run #31; adjust tests to match new layout (file -> template)