latest fixes for test