more tests and enhancements