Updating test helper methods