Fix test suite

Fixes so that the test suite will run