amendment 3, to squash later

- fix bug in test that was introduced during refactoring
amendment 4, to squash later

- introduce ActionRunnable to reduce code duplication