Includes Robolectric
Minor Refactor
Merge branch 'master' into integration