Android Test Project.
New test files.
Minor fixes.