- Added some debugging and testing facilities