Merge pull request #506 from bhariharan/unstable

Refactor the activity instrumentation test cases
Make radio button setup override able