Last changes for test with 21212