Updating test boilerplate