better handling for tests