multiple fixes for test2