minor fixes for testing