Fix android support and add more test apps