Removing some testing boilerplate