Updated tests, and fixed a logic error/approach in the DoubleDecorator