Finished Reverser and restore Test class