Minor fixes for testing