Revise tests with google/busybox