Add jUnit test and android Test