modifications to source code after Android Junit and Lint Testing