amend maint
merge new test