Added testing and debugging tools