Tests
Various minor enhancements.