a few changes for tests