More tests; all passing with cmd pointed at pele, and python -m unittest discover