loredana: rebase test c3 on master branch
cleanup