Added setup teardown functionality

This allows for better testing :)