Switch to py.test and bring Makefile up to speed