findbug fixes in main.test