last fixes for test