Added test classes and debugging