Final Removal of Test.java and putting it under android