Fixed up the tests, so that make check now works