CLA-921 Work on tests