Remove Ryan Bates better error gems, causes circular reference error.
Fixed error in hash call, reverted variable names from test names.