Corrected choked and added tests.