Refactor pytest support, use 'make test' now.