Simplify Reaction class and update tests