diff --git a/microdroid/tests/Android.bp b/microdroid/tests/Android.bp
deleted file mode 100644
index c939fef..0000000
--- a/microdroid/tests/Android.bp
+++ /dev/null
@@ -1,35 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-genrule {
-    name: "microdroid_contents_built",
-    tools: [
-        "list_image",
-        "debugfs_static",
-    ],
-    srcs: [":microdroid"],
-    out: ["microdroid_contents_built.txt"],
-    cmd: "$(location list_image) --debugfs_path $(location debugfs_static) $(location :microdroid) > $(out)",
-}
-
-genrule {
-    name: "diff_microdroid_contents",
-    srcs: [
-        "microdroid_contents_golden.txt",
-        ":microdroid_contents_built",
-    ],
-    out: ["true.sh"],
-    cmd: "if diff $(location microdroid_contents_golden.txt) $(location :microdroid_contents_built); then" +
-        "  echo true > $(out);" +
-        "else" +
-        "  echo To fix and update $(location microdroid_contents_golden.txt), please run:;" +
-        "  echo \" croot && m $(location :microdroid_contents_built) && cp $(location :microdroid_contents_built) $(location microdroid_contents_golden.txt)\";" +
-        "  exit 1;" +
-        "fi;",
-}
-
-sh_test_host {
-    name: "test_diff_microdroid_contents",
-    src: ":diff_microdroid_contents",
-}
diff --git a/microdroid/tests/microdroid_contents_golden.txt b/microdroid/tests/microdroid_contents_golden.txt
deleted file mode 100644
index e6dbefe..0000000
--- a/microdroid/tests/microdroid_contents_golden.txt
+++ /dev/null
@@ -1,355 +0,0 @@
-./
-./apex/
-./bin
-./d
-./data/
-./debug_ramdisk/
-./dev/
-./etc
-./linkerconfig/
-./lost+found/
-./mnt/
-./proc/
-./second_stage_resources/
-./sys/
-./system/
-./system/apex/
-./system/apex/com.android.runtime.apex
-./system/bin/
-./system/bin/[
-./system/bin/acpi
-./system/bin/apexd
-./system/bin/apkdmverity
-./system/bin/atrace
-./system/bin/authfs
-./system/bin/authfs_service
-./system/bin/base64
-./system/bin/basename
-./system/bin/blockdev
-./system/bin/bootstrap/
-./system/bin/bootstrap/linker64
-./system/bin/bootstrap/linker_asan64
-./system/bin/bootstrap/linkerconfig
-./system/bin/cal
-./system/bin/cat
-./system/bin/chattr
-./system/bin/chcon
-./system/bin/chgrp
-./system/bin/chmod
-./system/bin/chown
-./system/bin/chroot
-./system/bin/chrt
-./system/bin/cksum
-./system/bin/clear
-./system/bin/cmp
-./system/bin/comm
-./system/bin/cp
-./system/bin/cpio
-./system/bin/cut
-./system/bin/date
-./system/bin/dd
-./system/bin/debuggerd
-./system/bin/devmem
-./system/bin/df
-./system/bin/diced.microdroid
-./system/bin/diff
-./system/bin/dirname
-./system/bin/dmesg
-./system/bin/dos2unix
-./system/bin/du
-./system/bin/echo
-./system/bin/egrep
-./system/bin/env
-./system/bin/expand
-./system/bin/expr
-./system/bin/fallocate
-./system/bin/false
-./system/bin/fgrep
-./system/bin/file
-./system/bin/find
-./system/bin/flock
-./system/bin/fmt
-./system/bin/free
-./system/bin/fsync
-./system/bin/getconf
-./system/bin/getenforce
-./system/bin/getevent
-./system/bin/getprop
-./system/bin/grep
-./system/bin/groups
-./system/bin/gunzip
-./system/bin/gzip
-./system/bin/head
-./system/bin/hostname
-./system/bin/hwclock
-./system/bin/i2cdetect
-./system/bin/i2cdump
-./system/bin/i2cget
-./system/bin/i2cset
-./system/bin/iconv
-./system/bin/id
-./system/bin/ifconfig
-./system/bin/init
-./system/bin/inotifyd
-./system/bin/insmod
-./system/bin/install
-./system/bin/ionice
-./system/bin/iorenice
-./system/bin/kill
-./system/bin/killall
-./system/bin/linker64
-./system/bin/linker_asan64
-./system/bin/linkerconfig
-./system/bin/ln
-./system/bin/load_policy
-./system/bin/log
-./system/bin/logcat
-./system/bin/logd
-./system/bin/logname
-./system/bin/losetup
-./system/bin/ls
-./system/bin/lsattr
-./system/bin/lsmod
-./system/bin/lsof
-./system/bin/lspci
-./system/bin/lsusb
-./system/bin/md5sum
-./system/bin/microcom
-./system/bin/microdroid_launcher
-./system/bin/microdroid_manager
-./system/bin/mkdir
-./system/bin/mkfifo
-./system/bin/mknod
-./system/bin/mkswap
-./system/bin/mktemp
-./system/bin/modinfo
-./system/bin/modprobe
-./system/bin/more
-./system/bin/mount
-./system/bin/mountpoint
-./system/bin/mv
-./system/bin/nc
-./system/bin/netcat
-./system/bin/netstat
-./system/bin/nice
-./system/bin/nl
-./system/bin/nohup
-./system/bin/nproc
-./system/bin/nsenter
-./system/bin/od
-./system/bin/paste
-./system/bin/patch
-./system/bin/pgrep
-./system/bin/pidof
-./system/bin/pkill
-./system/bin/pmap
-./system/bin/printenv
-./system/bin/printf
-./system/bin/ps
-./system/bin/pwd
-./system/bin/readelf
-./system/bin/readlink
-./system/bin/realpath
-./system/bin/reboot
-./system/bin/renice
-./system/bin/restorecon
-./system/bin/rm
-./system/bin/rmdir
-./system/bin/rmmod
-./system/bin/rtcwake
-./system/bin/runcon
-./system/bin/secilc
-./system/bin/sed
-./system/bin/sendevent
-./system/bin/seq
-./system/bin/servicemanager.microdroid
-./system/bin/setenforce
-./system/bin/setprop
-./system/bin/setsid
-./system/bin/sh
-./system/bin/sha1sum
-./system/bin/sha224sum
-./system/bin/sha256sum
-./system/bin/sha384sum
-./system/bin/sha512sum
-./system/bin/sleep
-./system/bin/sort
-./system/bin/split
-./system/bin/start
-./system/bin/stat
-./system/bin/stop
-./system/bin/strace
-./system/bin/strings
-./system/bin/stty
-./system/bin/swapoff
-./system/bin/swapon
-./system/bin/sync
-./system/bin/sysctl
-./system/bin/tac
-./system/bin/tail
-./system/bin/tar
-./system/bin/taskset
-./system/bin/tee
-./system/bin/test
-./system/bin/time
-./system/bin/timeout
-./system/bin/tombstoned
-./system/bin/toolbox
-./system/bin/top
-./system/bin/touch
-./system/bin/toybox
-./system/bin/tr
-./system/bin/true
-./system/bin/truncate
-./system/bin/tty
-./system/bin/uclampset
-./system/bin/ueventd
-./system/bin/ulimit
-./system/bin/umount
-./system/bin/uname
-./system/bin/uniq
-./system/bin/unix2dos
-./system/bin/unlink
-./system/bin/unshare
-./system/bin/uptime
-./system/bin/usleep
-./system/bin/uudecode
-./system/bin/uuencode
-./system/bin/uuidgen
-./system/bin/vmstat
-./system/bin/watch
-./system/bin/wc
-./system/bin/which
-./system/bin/whoami
-./system/bin/xargs
-./system/bin/xxd
-./system/bin/yes
-./system/bin/zcat
-./system/bin/zipfuse
-./system/build.prop
-./system/com.android.runtime/
-./system/com.android.runtime/apex_manifest.pb
-./system/com.android.runtime/apex_pubkey
-./system/com.android.runtime/bin/
-./system/com.android.runtime/bin/crash_dump32
-./system/com.android.runtime/bin/crash_dump64
-./system/com.android.runtime/bin/linker
-./system/com.android.runtime/bin/linker64
-./system/com.android.runtime/bin/linker_asan
-./system/com.android.runtime/bin/linker_asan64
-./system/com.android.runtime/bin/linkerconfig
-./system/com.android.runtime/etc/
-./system/com.android.runtime/etc/linker.config.pb
-./system/com.android.runtime/lib/
-./system/com.android.runtime/lib/bionic/
-./system/com.android.runtime/lib/bionic/libc.so
-./system/com.android.runtime/lib/bionic/libdl.so
-./system/com.android.runtime/lib/bionic/libdl_android.so
-./system/com.android.runtime/lib/bionic/libm.so
-./system/com.android.runtime/lib/libc_malloc_debug.so
-./system/com.android.runtime/lib/libc_malloc_hooks.so
-./system/com.android.runtime/lib64/
-./system/com.android.runtime/lib64/bionic/
-./system/com.android.runtime/lib64/bionic/libc.so
-./system/com.android.runtime/lib64/bionic/libdl.so
-./system/com.android.runtime/lib64/bionic/libdl_android.so
-./system/com.android.runtime/lib64/bionic/libm.so
-./system/com.android.runtime/lib64/libc_malloc_debug.so
-./system/com.android.runtime/lib64/libc_malloc_hooks.so
-./system/etc/
-./system/etc/cgroups.json
-./system/etc/event-log-tags
-./system/etc/init/
-./system/etc/init/apexd.rc
-./system/etc/init/atrace.rc
-./system/etc/init/atrace_userdebug.rc
-./system/etc/init/authfs_service.rc
-./system/etc/init/diced.microdroid.rc
-./system/etc/init/hw/
-./system/etc/init/hw/init.rc
-./system/etc/init/logd.rc
-./system/etc/init/microdroid_manager.rc
-./system/etc/init/servicemanager.microdroid.rc
-./system/etc/init/tombstoned.rc
-./system/etc/linker.config.pb
-./system/etc/public.libraries.txt
-./system/etc/selinux/
-./system/etc/selinux/mapping/
-./system/etc/selinux/mapping/10000.0.cil
-./system/etc/selinux/plat_file_contexts
-./system/etc/selinux/plat_property_contexts
-./system/etc/selinux/plat_sepolicy.cil
-./system/etc/selinux/plat_sepolicy_and_mapping.sha256
-./system/etc/selinux/plat_service_contexts
-./system/etc/ueventd.rc
-./system/etc/vintf/
-./system/etc/vintf/compatibility_matrix.current.xml
-./system/etc/vintf/manifest.xml
-./system/lib64/
-./system/lib64/android.hardware.atrace@1.0.so
-./system/lib64/android.hardware.security.secureclock-V1-ndk.so
-./system/lib64/android.hardware.security.sharedsecret-V1-ndk.so
-./system/lib64/apex_aidl_interface-cpp.so
-./system/lib64/bootstrap/
-./system/lib64/bootstrap/libc.so
-./system/lib64/bootstrap/libdl.so
-./system/lib64/bootstrap/libdl_android.so
-./system/lib64/bootstrap/libm.so
-./system/lib64/heapprofd_client_api.so
-./system/lib64/ld-android.so
-./system/lib64/libadbd_auth.so
-./system/lib64/libadbd_fs.so
-./system/lib64/libandroid_runtime_lazy.so
-./system/lib64/libartpalette-system.so
-./system/lib64/libbacktrace.so
-./system/lib64/libbase.so
-./system/lib64/libbinder.so
-./system/lib64/libbinder_ndk.so
-./system/lib64/libbinder_rpc_unstable.so
-./system/lib64/libbootloader_message.so
-./system/lib64/libc++.so
-./system/lib64/libc.so
-./system/lib64/libcap.so
-./system/lib64/libcgrouprc.so
-./system/lib64/libcrypto.so
-./system/lib64/libcrypto_utils.so
-./system/lib64/libcutils.so
-./system/lib64/libdebuggerd_client.so
-./system/lib64/libdl.so
-./system/lib64/libdl_android.so
-./system/lib64/libext2_uuid.so
-./system/lib64/libext4_utils.so
-./system/lib64/libfec.so
-./system/lib64/libfs_mgr.so
-./system/lib64/libgsi.so
-./system/lib64/libhidl-gen-utils.so
-./system/lib64/libhidlbase.so
-./system/lib64/libjsoncpp.so
-./system/lib64/libkeystore2_crypto.so
-./system/lib64/libkeyutils.so
-./system/lib64/liblog.so
-./system/lib64/liblogwrap.so
-./system/lib64/liblp.so
-./system/lib64/liblzma.so
-./system/lib64/libm.so
-./system/lib64/libpackagelistparser.so
-./system/lib64/libpcre2.so
-./system/lib64/libpdx_default_transport.so
-./system/lib64/libprocessgroup.so
-./system/lib64/libprocessgroup_setup.so
-./system/lib64/libprocinfo.so
-./system/lib64/libprotobuf-cpp-full.so
-./system/lib64/libselinux.so
-./system/lib64/libsparse.so
-./system/lib64/libsquashfs_utils.so
-./system/lib64/libstdc++.so
-./system/lib64/libsysutils.so
-./system/lib64/libtinyxml2.so
-./system/lib64/libtombstoned_client.so
-./system/lib64/libunwindstack.so
-./system/lib64/libutils.so
-./system/lib64/libvintf.so
-./system/lib64/libvndksupport.so
-./system/lib64/libz.so
-./system/lib64/libziparchive.so
-./vendor/