wip
updates
new test class