add test package plus some more sim tinkering