Fix some issues using testing