Added project files for Android Studio.  Refactor test.