Slowly cleaning up syntaxes, also adding tests from old suite to new using Testify automated process.