initial rebase commit

fixed test targets

fixed hardware and software tests to reflect correct tag ids