Merge pull request #121 from adamralph/113

#133 refactor: removed redundant code from component tests
#119 refactor: align acceptance tests with component tests and add teardowns