Add cloud service UT + new + show + clean up to new coding style