Merge "Adding tests and move launcher.proto"