LUN-455. Updated tests to run in a different way.