changes to action handling, better given, when, then constructs in the tests