WIP for getting tests to work again