just a few modifications for tests