More testing and debugging