Made 'make test check' and 'make check test' work in any order.