Renamed before/after methods and interfaces to setup/teardown