Cleanup for older compilers. Some test code added.
Cleanup for older compilers. Some test code added.