CLA-677 Work on tests