initial rebase commit

fixed test targets