Fixed Android invocations + Unit tests