Updated tests to run on both Kepler and Luna. Removed reference to text

strings that only appear on Kepler. Also cleaned up some sloppy indentation.