a little changes for tests/