some test changes + and fixes