Android-Sofia Integrated...hopefully? Included Testing...

Same as previous commit, but two extra classes involving testing.