wip updating some tests
wip trying to make tests work, not very successfully