Fixes for `make check` for continuous integration support

cc @bhearsum