Still working to fix dependency issues in build.gradle. Still haven't gotten Junit tests to run properly since reconfig in sourcesSets.