Improve 'make test'