Fixed up test/aapt