diff --git a/app/src/test/java/com/gh4a/resolver/LinkParserTest.java b/app/src/test/java/com/gh4a/resolver/LinkParserTest.java
index d6e252d91c..4e549ac531 100644
--- a/app/src/test/java/com/gh4a/resolver/LinkParserTest.java
+++ b/app/src/test/java/com/gh4a/resolver/LinkParserTest.java
@@ -2,9 +2,7 @@
 
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.fragment.app.FragmentActivity;
 
-import com.gh4a.BuildConfig;
 import com.gh4a.activities.BlogListActivity;
 import com.gh4a.activities.CommitActivity;
 import com.gh4a.activities.CompareActivity;
@@ -26,18 +24,17 @@
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
+import androidx.fragment.app.FragmentActivity;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 
-@SuppressWarnings("ConstantConditions")
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class)
 public class LinkParserTest {
     private FragmentActivity mActivity;
 
@@ -61,7 +58,7 @@ public void linkToGist__opensGistActivity() {
     }
 
     @Test
-    public void linkToGist_withUserInPath__opensGistActivity() throws Exception {
+    public void linkToGist_withUserInPath__opensGistActivity() {
         LinkParser.ParseResult result = parseLink("https://gist.github.com/user/gistId");
         assertRedirectsTo(result, GistActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -87,24 +84,24 @@ public void reservedPaths__openBrowser() {
     }
 
     @Test
-    public void exploreLink__opensTrendingActivity() throws Exception {
+    public void exploreLink__opensTrendingActivity() {
         assertRedirectsTo(parseLink("https://github.com/explore"), TrendingActivity.class);
     }
 
     @Test
-    public void blogLink__opensBlogListActivity() throws Exception {
+    public void blogLink__opensBlogListActivity() {
         assertRedirectsTo(parseLink("https://github.com/blog"), BlogListActivity.class);
         assertRedirectsTo(parseLink("https://blog.github.com"), BlogListActivity.class);
     }
 
     @Test
-    public void blogLink_withBlogInPath__opensBrowser() throws Exception {
+    public void blogLink_withBlogInPath__opensBrowser() {
         assertRedirectsToBrowser(parseLink("https://github.com/blog/blog-title"));
         assertRedirectsToBrowser(parseLink("https://blog.github.com/blog-title"));
     }
 
     @Test
-    public void organizationLink__opensUserActivity() throws Exception {
+    public void organizationLink__opensUserActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/orgs/android");
         assertRedirectsTo(result, UserActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -113,13 +110,12 @@ public void organizationLink__opensUserActivity() throws Exception {
     }
 
     @Test
-    public void organizationLink_withoutName__opensBrowser() throws Exception {
+    public void organizationLink_withoutName__opensBrowser() {
         assertRedirectsToBrowser(parseLink("https://github.com/orgs"));
     }
 
     @Test
-    public void organisationLink_leadingToMembers__opensOrganizationMemberListActivity()
-            throws Exception {
+    public void organisationLink_leadingToMembers__opensOrganizationMemberListActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/orgs/android/people");
         assertRedirectsTo(result, OrganizationMemberListActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -128,7 +124,7 @@ public void organisationLink_leadingToMembers__opensOrganizationMemberListActivi
     }
 
     @Test
-    public void userLink__opensUserActivity() throws Exception {
+    public void userLink__opensUserActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan");
         assertRedirectsTo(result, UserActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -137,7 +133,7 @@ public void userLink__opensUserActivity() throws Exception {
     }
 
     @Test
-    public void userLink_withRepositoriesTab__loadsUserRepos() throws Exception {
+    public void userLink_withRepositoriesTab__loadsUserRepos() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan?tab=repositories");
         UserReposLoadTask loadTask = assertThatLoadTaskIs(result.loadTask, UserReposLoadTask.class);
         assertThat("Loading starred repos is set to true", loadTask.mShowStars, is(false));
@@ -145,7 +141,7 @@ public void userLink_withRepositoriesTab__loadsUserRepos() throws Exception {
     }
 
     @Test
-    public void userLink_withStarsTab__loadsUserStarredRepos() throws Exception {
+    public void userLink_withStarsTab__loadsUserStarredRepos() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan?tab=stars");
         UserReposLoadTask loadTask = assertThatLoadTaskIs(result.loadTask, UserReposLoadTask.class);
         assertThat("Loading starred repos is set to false", loadTask.mShowStars, is(true));
@@ -153,7 +149,7 @@ public void userLink_withStarsTab__loadsUserStarredRepos() throws Exception {
     }
 
     @Test
-    public void userLink_withFollowersTab__loadsUserFollowers() throws Exception {
+    public void userLink_withFollowersTab__loadsUserFollowers() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan?tab=followers");
         UserFollowersLoadTask loadTask =
                 assertThatLoadTaskIs(result.loadTask, UserFollowersLoadTask.class);
@@ -162,7 +158,7 @@ public void userLink_withFollowersTab__loadsUserFollowers() throws Exception {
     }
 
     @Test
-    public void userLink_withFollowingTab__loadsUserFollows() throws Exception {
+    public void userLink_withFollowingTab__loadsUserFollows() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan?tab=following");
         UserFollowersLoadTask loadTask =
                 assertThatLoadTaskIs(result.loadTask, UserFollowersLoadTask.class);
@@ -171,7 +167,7 @@ public void userLink_withFollowingTab__loadsUserFollows() throws Exception {
     }
 
     @Test
-    public void userLink_withUnknownTab__opensUserActivity() throws Exception {
+    public void userLink_withUnknownTab__opensUserActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan?tab=unknown");
         assertRedirectsTo(result, UserActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -180,7 +176,7 @@ public void userLink_withUnknownTab__opensUserActivity() throws Exception {
     }
 
     @Test
-    public void repositoryLink__opensRepositoryActivity() throws Exception {
+    public void repositoryLink__opensRepositoryActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a");
         assertRedirectsTo(result, RepositoryActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -194,7 +190,7 @@ public void repositoryLink__opensRepositoryActivity() throws Exception {
     }
 
     @Test
-    public void releasesLink__opensReleaseListActivity() throws Exception {
+    public void releasesLink__opensReleaseListActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/releases");
         assertRedirectsTo(result, ReleaseListActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -204,7 +200,7 @@ public void releasesLink__opensReleaseListActivity() throws Exception {
     }
 
     @Test
-    public void releaseLink_withoutTagId__opensReleaseListActivity() throws Exception {
+    public void releaseLink_withoutTagId__opensReleaseListActivity() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/releases/tag");
         assertRedirectsTo(result, ReleaseListActivity.class);
@@ -215,7 +211,7 @@ public void releaseLink_withoutTagId__opensReleaseListActivity() throws Exceptio
     }
 
     @Test
-    public void releaseLink_withTagId__loadsRelease() throws Exception {
+    public void releaseLink_withTagId__loadsRelease() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/releases/tag/tagName");
         ReleaseLoadTask loadTask = assertThatLoadTaskIs(result.loadTask, ReleaseLoadTask.class);
@@ -225,7 +221,7 @@ public void releaseLink_withTagId__loadsRelease() throws Exception {
     }
 
     @Test
-    public void issuesLink__opensIssueListActivity() throws Exception {
+    public void issuesLink__opensIssueListActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/issues");
         assertRedirectsTo(result, IssueListActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -236,7 +232,7 @@ public void issuesLink__opensIssueListActivity() throws Exception {
     }
 
     @Test
-    public void newIssueLink__opensIssueEditActivity() throws Exception {
+    public void newIssueLink__opensIssueEditActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/issues/new");
         assertRedirectsTo(result, IssueEditActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -247,7 +243,7 @@ public void newIssueLink__opensIssueEditActivity() throws Exception {
     }
 
     @Test
-    public void issueLink__opensIssueActivity() throws Exception {
+    public void issueLink__opensIssueActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/issues/42");
         assertRedirectsTo(result, IssueActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -259,14 +255,14 @@ public void issueLink__opensIssueActivity() throws Exception {
     }
 
     @Test
-    public void issueLink_withIncorrectNumber__opensBrowser() throws Exception {
+    public void issueLink_withIncorrectNumber__opensBrowser() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/issues/34no");
         assertRedirectsToBrowser(result);
     }
 
     @Test
     public void issueLink_withCommentMarker__opensIssueActivity_andHasCommentMarker()
-            throws Exception {
+            {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/issues/42#issuecomment-1234");
         assertRedirectsTo(result, IssueActivity.class);
@@ -281,7 +277,7 @@ public void issueLink_withCommentMarker__opensIssueActivity_andHasCommentMarker(
     }
 
     @Test
-    public void issueLink_withIncorrectCommentMarker_opensIssueActivity() throws Exception {
+    public void issueLink_withIncorrectCommentMarker_opensIssueActivity() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/issues/42#issuecomment-A3");
         assertRedirectsTo(result, IssueActivity.class);
@@ -294,7 +290,7 @@ public void issueLink_withIncorrectCommentMarker_opensIssueActivity() throws Exc
     }
 
     @Test
-    public void pullRequestsLink__opensIssueListActivity() throws Exception {
+    public void pullRequestsLink__opensIssueListActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/pulls");
         assertRedirectsTo(result, IssueListActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -306,7 +302,7 @@ public void pullRequestsLink__opensIssueListActivity() throws Exception {
     }
 
     @Test
-    public void wikiLink__opensWikiListActivity() throws Exception {
+    public void wikiLink__opensWikiListActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/wiki");
         assertRedirectsTo(result, WikiListActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -317,19 +313,19 @@ public void wikiLink__opensWikiListActivity() throws Exception {
     }
 
     @Test
-    public void pullRequestLink_withoutId__opensBrowser() throws Exception {
+    public void pullRequestLink_withoutId__opensBrowser() {
         assertRedirectsToBrowser(parseLink("https://github.com/slapperwan/gh4a/pull"));
     }
 
     @Test
-    public void pullRequestLink_withInvalidId__opensBrowser() throws Exception {
+    public void pullRequestLink_withInvalidId__opensBrowser() {
         assertRedirectsToBrowser(parseLink("https://github.com/slapperwan/gh4a/pull/-1"));
         assertRedirectsToBrowser(parseLink("https://github.com/slapperwan/gh4a/pull/fwbi"));
         assertRedirectsToBrowser(parseLink("https://github.com/slapperwan/gh4a/pull/0"));
     }
 
     @Test
-    public void pullRequestLink__opensPullRequestActivity() throws Exception {
+    public void pullRequestLink__opensPullRequestActivity() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/pull/12");
         assertRedirectsTo(result, PullRequestActivity.class);
         Bundle extras = result.intent.getExtras();
@@ -343,8 +339,7 @@ public void pullRequestLink__opensPullRequestActivity() throws Exception {
     }
 
     @Test
-    public void pullRequestLink_withCommentMarker__opensPullRequestActivity_andHasCommentMarker()
-            throws Exception {
+    public void pullRequestLink_withCommentMarker__opensPullRequestActivity_andHasCommentMarker() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/14#issuecomment-7546");
         assertRedirectsTo(result, PullRequestActivity.class);
@@ -360,7 +355,7 @@ public void pullRequestLink_withCommentMarker__opensPullRequestActivity_andHasCo
     }
 
     @Test
-    public void pullRequestLink_withCommitsPage__opensPullRequestCommits() throws Exception {
+    public void pullRequestLink_withCommitsPage__opensPullRequestCommits() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/23/commits");
         assertRedirectsTo(result, PullRequestActivity.class);
@@ -376,7 +371,7 @@ public void pullRequestLink_withCommitsPage__opensPullRequestCommits() throws Ex
     }
 
     @Test
-    public void pullRequestLink_withFilesPage__opensPullRequestFiles() throws Exception {
+    public void pullRequestLink_withFilesPage__opensPullRequestFiles() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/23/files");
         assertRedirectsTo(result, PullRequestActivity.class);
@@ -392,7 +387,7 @@ public void pullRequestLink_withFilesPage__opensPullRequestFiles() throws Except
     }
 
     @Test
-    public void pullRequestLink_withUnknownPage__opensPullRequest() throws Exception {
+    public void pullRequestLink_withUnknownPage__opensPullRequest() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/23/unknown");
         assertRedirectsTo(result, PullRequestActivity.class);
@@ -407,7 +402,7 @@ public void pullRequestLink_withUnknownPage__opensPullRequest() throws Exception
     }
 
     @Test
-    public void pullRequestLink_withDiffMarker__loadsDiff() throws Exception {
+    public void pullRequestLink_withDiffMarker__loadsDiff() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/665/files" +
                         "#diff-38f43208e0c158ca7b78e175b8846bc6");
@@ -425,7 +420,7 @@ public void pullRequestLink_withDiffMarker__loadsDiff() throws Exception {
     }
 
     @Test
-    public void pullRequestLink_withDiffMarker_andLeftNumber__loadsDiff() throws Exception {
+    public void pullRequestLink_withDiffMarker_andLeftNumber__loadsDiff() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/665/files" +
                         "#diff-38f43208e0c158ca7b78e175b8846bc6L24");
@@ -443,7 +438,7 @@ public void pullRequestLink_withDiffMarker_andLeftNumber__loadsDiff() throws Exc
     }
 
     @Test
-    public void pullRequestLink_withDiffMarker_andLineRange__loadsDiff() throws Exception {
+    public void pullRequestLink_withDiffMarker_andLineRange__loadsDiff() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/665/files" +
                         "#diff-38f43208e0c158ca7b78e175b8846bc6L24-L26");
@@ -479,7 +474,7 @@ public void pullRequestLink_withDiffMarker_andInvalidNumber__opensPullRequest()
     }
 
     @Test
-    public void pullRequestLink_withDiffMarker_andRightNumber__loadsDiff() throws Exception {
+    public void pullRequestLink_withDiffMarker_andRightNumber__loadsDiff() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/665/files" +
                         "#diff-38f43208e0c158ca7b78e175b8846bc6R24");
@@ -497,7 +492,7 @@ public void pullRequestLink_withDiffMarker_andRightNumber__loadsDiff() throws Ex
     }
 
     @Test
-    public void pullRequestLink_withDiffMarker_andIncorrectHash__loadsDiff() throws Exception {
+    public void pullRequestLink_withDiffMarker_andIncorrectHash__loadsDiff() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/665/files" +
                         "#diff-38f43208e0c158ca7b78e1");
@@ -514,7 +509,7 @@ public void pullRequestLink_withDiffMarker_andIncorrectHash__loadsDiff() throws
     }
 
     @Test
-    public void pullRequestReviewLink__loadsReview() throws Exception {
+    public void pullRequestReviewLink__loadsReview() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/665#pullrequestreview-59822171");
         PullRequestReviewLoadTask loadTask =
@@ -527,7 +522,7 @@ public void pullRequestReviewLink__loadsReview() throws Exception {
     }
 
     @Test
-    public void pullRequestReviewCommentLink__loadsReviewComment() throws Exception {
+    public void pullRequestReviewCommentLink__loadsReviewComment() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/665#discussion_r136306029");
         PullRequestReviewCommentLoadTask loadTask =
@@ -540,7 +535,7 @@ public void pullRequestReviewCommentLink__loadsReviewComment() throws Exception
     }
 
     @Test
-    public void pullRequestReviewDiffLink__loadsReviewDiff() throws Exception {
+    public void pullRequestReviewDiffLink__loadsReviewDiff() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/pull/665" +
                 "#discussion-diff-136304421R590");
         PullRequestReviewDiffLoadTask loadTask =
@@ -556,7 +551,7 @@ public void pullRequestReviewDiffLink__loadsReviewDiff() throws Exception {
     }
 
     @Test
-    public void pullRequestDiffCommentLink__loadsReviewDiff() throws Exception {
+    public void pullRequestDiffCommentLink__loadsReviewDiff() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/pull/665/files#r136306029");
         PullRequestDiffCommentLoadTask loadTask =
@@ -570,7 +565,7 @@ public void pullRequestDiffCommentLink__loadsReviewDiff() throws Exception {
     }
 
     @Test
-    public void commitLink__opensCommitActivity() throws Exception {
+    public void commitLink__opensCommitActivity() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/commit/commitSha");
         assertRedirectsTo(result, CommitActivity.class);
@@ -585,12 +580,12 @@ public void commitLink__opensCommitActivity() throws Exception {
     }
 
     @Test
-    public void commitLink_withoutCommitSha__opensBrowser() throws Exception {
+    public void commitLink_withoutCommitSha__opensBrowser() {
         assertRedirectsToBrowser(parseLink("https://github.com/slapperwan/gh4a/commit"));
     }
 
     @Test
-    public void commitLink_withDiffMarker__loadsCommitDiff() throws Exception {
+    public void commitLink_withDiffMarker__loadsCommitDiff() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/commit/" +
                         "57a054f85ade77ebb80eecd671aace770b312bf5" +
@@ -611,7 +606,7 @@ public void commitLink_withDiffMarker__loadsCommitDiff() throws Exception {
     }
 
     @Test
-    public void commitLink_withCommentMarker__opensCommitActivity() throws Exception {
+    public void commitLink_withCommentMarker__opensCommitActivity() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/commit/commitSha#commitcomment-12");
         CommitCommentLoadTask loadTask =
@@ -625,13 +620,13 @@ public void commitLink_withCommentMarker__opensCommitActivity() throws Exception
     }
 
     @Test
-    public void commitsLink__handlesRefAndPath_andRedirectsToCommitsPage() throws Exception {
+    public void commitsLink__handlesRefAndPath_andRedirectsToCommitsPage() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/commits");
         RefPathDisambiguationTask loadTask =
                 assertThatLoadTaskIs(result.loadTask, RefPathDisambiguationTask.class);
         assertThat("User name is incorrect", loadTask.mRepoOwner, is("slapperwan"));
         assertThat("Repo name is incorrect", loadTask.mRepoName, is("gh4a"));
-        assertThat("Ref and path is not empty", loadTask.mRefAndPath, isEmptyString());
+        assertThat("Ref and path is not empty", loadTask.mRefAndPath, is(equalTo("")));
         assertThat("Page does not lead to commits", loadTask.mInitialPage,
                 is(RepositoryActivity.PAGE_COMMITS));
         assertThat("Fragment is set", loadTask.mFragment, is(nullValue()));
@@ -639,8 +634,7 @@ public void commitsLink__handlesRefAndPath_andRedirectsToCommitsPage() throws Ex
     }
 
     @Test
-    public void commitsLink_withBranch__handlesRefAndPath_andRedirectsToCommitsPage()
-            throws Exception {
+    public void commitsLink_withBranch__handlesRefAndPath_andRedirectsToCommitsPage() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/commits/master");
         RefPathDisambiguationTask loadTask =
@@ -655,8 +649,7 @@ public void commitsLink_withBranch__handlesRefAndPath_andRedirectsToCommitsPage(
     }
 
     @Test
-    public void commitsLink_withRefsHeads__handlesRefAndPath_andRedirectsToCommitsPage()
-            throws Exception {
+    public void commitsLink_withRefsHeads__handlesRefAndPath_andRedirectsToCommitsPage() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/commits/refs/heads/master");
         RefPathDisambiguationTask loadTask =
@@ -671,13 +664,13 @@ public void commitsLink_withRefsHeads__handlesRefAndPath_andRedirectsToCommitsPa
     }
 
     @Test
-    public void treeLink__handlesRefAndPath_andRedirectsToFilesPage() throws Exception {
+    public void treeLink__handlesRefAndPath_andRedirectsToFilesPage() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/tree");
         RefPathDisambiguationTask loadTask =
                 assertThatLoadTaskIs(result.loadTask, RefPathDisambiguationTask.class);
         assertThat("User name is incorrect", loadTask.mRepoOwner, is("slapperwan"));
         assertThat("Repo name is incorrect", loadTask.mRepoName, is("gh4a"));
-        assertThat("Ref and path is not empty", loadTask.mRefAndPath, isEmptyString());
+        assertThat("Ref and path is not empty", loadTask.mRefAndPath, is(equalTo("")));
         assertThat("Page does not lead to files", loadTask.mInitialPage,
                 is(RepositoryActivity.PAGE_FILES));
         assertThat("Fragment is set", loadTask.mFragment, is(nullValue()));
@@ -685,7 +678,7 @@ public void treeLink__handlesRefAndPath_andRedirectsToFilesPage() throws Excepti
     }
 
     @Test
-    public void treeLink_withBranch__handlesRefAndPath_andRedirectsToFilesPage() throws Exception {
+    public void treeLink_withBranch__handlesRefAndPath_andRedirectsToFilesPage() {
         LinkParser.ParseResult result = parseLink("https://github.com/slapperwan/gh4a/tree/master");
         RefPathDisambiguationTask loadTask =
                 assertThatLoadTaskIs(result.loadTask, RefPathDisambiguationTask.class);
@@ -699,8 +692,7 @@ public void treeLink_withBranch__handlesRefAndPath_andRedirectsToFilesPage() thr
     }
 
     @Test
-    public void treeLink_withRefsHeads__handlesRefAndPath_andRedirectsToFilesPage()
-            throws Exception {
+    public void treeLink_withRefsHeads__handlesRefAndPath_andRedirectsToFilesPage() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/tree/refs/heads/master");
         RefPathDisambiguationTask loadTask =
@@ -715,7 +707,7 @@ public void treeLink_withRefsHeads__handlesRefAndPath_andRedirectsToFilesPage()
     }
 
     @Test
-    public void blobLink__handlesRefAndPath_andRedirectsToFileViewer() throws Exception {
+    public void blobLink__handlesRefAndPath_andRedirectsToFileViewer() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/blob/master/README.md");
         RefPathDisambiguationTask loadTask =
@@ -729,8 +721,7 @@ public void blobLink__handlesRefAndPath_andRedirectsToFileViewer() throws Except
     }
 
     @Test
-    public void blobLink_withLineMarker__handlesRefAndPath_andRedirectsToFileViewer()
-            throws Exception {
+    public void blobLink_withLineMarker__handlesRefAndPath_andRedirectsToFileViewer() {
         LinkParser.ParseResult result =
                 parseLink("https://github.com/slapperwan/gh4a/blob/master/build.gradle#L10");
         RefPathDisambiguationTask loadTask =
@@ -744,17 +735,17 @@ public void blobLink_withLineMarker__handlesRefAndPath_andRedirectsToFileViewer(
     }
 
     @Test
-    public void blobLink_withoutBranchAndPath__opensBrowser() throws Exception {
+    public void blobLink_withoutBranchAndPath__opensBrowser() {
         assertRedirectsToBrowser(parseLink("https://github.com/slapperwan/gh4a/blob"));
     }
 
     @Test
-    public void compareLink__redirectsToCompareView() throws Exception {
+    public void compareLink__redirectsToCompareView() {
 
     }
 
     @Test
-    public void compareLink_withoutRefs__opensBrowser() throws Exception {
+    public void compareLink_withoutRefs__opensBrowser() {
         LinkParser.ParseResult result =
                 (parseLink("https://github.com/slapperwan/gh4a/compare/v4.2.0...v4.2.1"));
         assertRedirectsTo(result, CompareActivity.class);
@@ -768,12 +759,12 @@ public void compareLink_withoutRefs__opensBrowser() throws Exception {
     }
 
     @Test
-    public void compareLink_withIncompleteRefs__opensBrowser() throws Exception {
+    public void compareLink_withIncompleteRefs__opensBrowser() {
         assertRedirectsToBrowser(parseLink("https://github.com/slapperwan/gh4a/compare/v4.2.0..."));
     }
 
     @Test
-    public void unknownRepositoryLink__opensBrowser() throws Exception {
+    public void unknownRepositoryLink__opensBrowser() {
         assertRedirectsToBrowser(parseLink("https://github.com/slapperwan/gh4a/unknown"));
     }