amend test3
rebase test in master
fixed conficts