bugfix: make --before actually work

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
update tests

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
Merge branch 'feature/before-after' into production