fixing of tests. ready for merging to Feature branch