reorder method params
these should have been being passed through
fix test
rework some code
working towards another test fix