fixes for testing environment