Updated reference to android-library with improved tests