Make Action/Add tests pass