rename `add` to `push` and `remove` to `pop` in methods and tests