cleaned up some code. added parallel running of android tests but then had to comment it out for now as parallel runs were conflicting with each other.