Merge "Remove TestServerApp"