fixes for testing