reargued source tree so that we can run tests from command line and android studio
disabled the ServiceTest as it's currently broken.
will fix on a separate bug.