fixes for test environment.