Removing duplicate init and teardowns