Removed debugging code
Almost done with all API except throws and doesNotThrow