more fixes for testing