Working...
Remove sample files that cause Android compile errors
Add more tests
Add more tests - not working