Refactored tests.
Removed text protocol codes.
Merged.