diff --git a/src/test/java/com/rarchives/ripme/tst/AppTest.java b/src/test/java/com/rarchives/ripme/tst/AppTest.java
index 630e46d9..fb9bc680 100644
--- a/src/test/java/com/rarchives/ripme/tst/AppTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/AppTest.java
@@ -10,21 +10,21 @@ public class AppTest extends TestCase {
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName ) {
-        super( testName );
+    public AppTest(String testName) {
+        super(testName);
     }
 
     /**
      * @return the suite of tests being tested
      */
     public static Test suite() {
-        return new TestSuite( AppTest.class );
+        return new TestSuite(AppTest.class);
     }
 
     /**
      * Rigourous Test :-)
      */
     public void testApp() {
-        assertTrue( true );
+        assertTrue(true);
     }
 }
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/BasicRippersTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/BasicRippersTest.java
deleted file mode 100644
index 751242c6..00000000
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/BasicRippersTest.java
+++ /dev/null
@@ -1,301 +0,0 @@
-package com.rarchives.ripme.tst.ripper.rippers;
-
-import java.io.IOException;
-import java.net.URL;
-
-import com.rarchives.ripme.ripper.AbstractRipper;
-import com.rarchives.ripme.ripper.rippers.DeviantartRipper;
-import com.rarchives.ripme.ripper.rippers.EightmusesRipper;
-import com.rarchives.ripme.ripper.rippers.FivehundredpxRipper;
-import com.rarchives.ripme.ripper.rippers.FuraffinityRipper;
-import com.rarchives.ripme.ripper.rippers.GirlsOfDesireRipper;
-import com.rarchives.ripme.ripper.rippers.HentaifoundryRipper;
-import com.rarchives.ripme.ripper.rippers.ImagearnRipper;
-import com.rarchives.ripme.ripper.rippers.ImagebamRipper;
-import com.rarchives.ripme.ripper.rippers.ImagevenueRipper;
-import com.rarchives.ripme.ripper.rippers.ImgboxRipper;
-import com.rarchives.ripme.ripper.rippers.ModelmayhemRipper;
-import com.rarchives.ripme.ripper.rippers.MotherlessRipper;
-import com.rarchives.ripme.ripper.rippers.NfsfwRipper;
-import com.rarchives.ripme.ripper.rippers.PhotobucketRipper;
-import com.rarchives.ripme.ripper.rippers.PornhubRipper;
-import com.rarchives.ripme.ripper.rippers.ShesFreakyRipper;
-import com.rarchives.ripme.ripper.rippers.TapasticRipper;
-import com.rarchives.ripme.ripper.rippers.TeenplanetRipper;
-import com.rarchives.ripme.ripper.rippers.TwitterRipper;
-import com.rarchives.ripme.ripper.rippers.TwodgalleriesRipper;
-import com.rarchives.ripme.ripper.rippers.VidbleRipper;
-import com.rarchives.ripme.ripper.rippers.VineRipper;
-import com.rarchives.ripme.ripper.rippers.VkRipper;
-import com.rarchives.ripme.ripper.rippers.XhamsterRipper;
-import com.rarchives.ripme.ripper.rippers.PichunterRipper;
-import com.rarchives.ripme.ripper.rippers.TheyiffgalleryRipper;
-
-
-/**
- * Simple test cases for various rippers.
- * These tests only require a URL, no other special validation.
- */
-public class BasicRippersTest extends RippersTest {
-
-    public void testDeviantartAlbum() throws IOException {
-        DeviantartRipper ripper = new DeviantartRipper(new URL("http://airgee.deviantart.com/gallery/"));
-        testRipper(ripper);
-    }
-    public void testDeviantartNSFWAlbum() throws IOException {
-        // NSFW gallery
-        DeviantartRipper ripper = new DeviantartRipper(new URL("http://faterkcx.deviantart.com/gallery/"));
-        testRipper(ripper);
-    }
-
-    public void testEightmusesAlbum() throws IOException {
-        EightmusesRipper ripper = new EightmusesRipper(new URL("https://www.8muses.com/album/jab-comics/a-model-life"));
-        testRipper(ripper);
-    }
-
-    /*
-    public void testVineboxAlbum() throws IOException {
-        FineboxRipper ripper = new FineboxRipper(new URL("http://vinebox.co/u/wi57hMjc2Ka"));
-        testRipper(ripper);
-    }
-    */
-
-    /*
-    public void testFineboxAlbum() throws IOException {
-        FineboxRipper ripper = new FineboxRipper(new URL("http://finebox.co/u/wi57hMjc2Ka"));
-        testRipper(ripper);
-    }
-    */
-
-    /*
-    public void testRedditSubredditRip() throws IOException {
-        RedditRipper ripper = new RedditRipper(new URL("http://www.reddit.com/r/nsfw_oc"));
-        testRipper(ripper);
-    }
-    public void testRedditSubredditTopRip() throws IOException {
-        RedditRipper ripper = new RedditRipper(new URL("http://www.reddit.com/r/nsfw_oc/top?t=all"));
-        testRipper(ripper);
-    }
-    public void testRedditPostRip() throws IOException {
-        RedditRipper ripper = new RedditRipper(new URL("http://www.reddit.com/r/UnrealGirls/comments/1ziuhl/in_class_veronique_popa/"));
-        testRipper(ripper);
-    }
-
-    public void testTumblrFullRip() throws IOException {
-        TumblrRipper ripper = new TumblrRipper(new URL("http://wrouinr.tumblr.com/archive"));
-        testRipper(ripper);
-    }
-    public void testTumblrTagRip() throws IOException {
-        TumblrRipper ripper = new TumblrRipper(new URL("http://topinstagirls.tumblr.com/tagged/berlinskaya"));
-        testRipper(ripper);
-    }
-    public void testTumblrPostRip() throws IOException {
-        TumblrRipper ripper = new TumblrRipper(new URL("http://sadbaffoon.tumblr.com/post/132045920789/what-a-hoe"));
-        testRipper(ripper);
-    }
-    */
-
-    public void testTwitterUserRip() throws IOException {
-        TwitterRipper ripper = new TwitterRipper(new URL("https://twitter.com/danngamber01/media"));
-        testRipper(ripper);
-    }
-    /*
-    public void testTwitterSearchRip() throws IOException {
-        TwitterRipper ripper = new TwitterRipper(new URL("https://twitter.com/search?q=from%3ADaisyfairymfc%20filter%3Aimages&src=typd"));
-        testRipper(ripper);
-    }
-    */
-
-    public void test500pxAlbum() throws IOException {
-        FivehundredpxRipper ripper = new FivehundredpxRipper(new URL("https://marketplace.500px.com/alexander_hurman"));
-        testRipper(ripper);
-    }
-
-    /*
-    public void testFlickrAlbum() throws IOException {
-        FlickrRipper ripper = new FlickrRipper(new URL("https://www.flickr.com/photos/leavingallbehind/sets/72157621895942720/"));
-        testRipper(ripper);
-    }
-    */
-
-    /*
-    public void testFuraffinityAlbum() throws IOException {
-        FuraffinityRipper ripper = new FuraffinityRipper(new URL("https://www.furaffinity.net/gallery/mustardgas/"));
-        testRipper(ripper);
-    }
-    */
-
-    /*
-    public void testFuskatorAlbum() throws IOException {
-        FuskatorRipper ripper = new FuskatorRipper(new URL("http://fuskator.com/full/emJa1U6cqbi/index.html"));
-        testRipper(ripper);
-    }
-    */
-    
-    public void testGirlsofdesireAlbum() throws IOException {
-        GirlsOfDesireRipper ripper = new GirlsOfDesireRipper(new URL("http://www.girlsofdesire.org/galleries/krillia/"));
-        testRipper(ripper);
-    }
-
-    public void testHentaifoundryRip() throws IOException {
-        HentaifoundryRipper ripper = new HentaifoundryRipper(new URL("http://www.hentai-foundry.com/pictures/user/personalami"));
-        testRipper(ripper);
-    }
-
-    public void testImagearnRip() throws IOException {
-        AbstractRipper ripper = new ImagearnRipper(new URL("http://imagearn.com//gallery.php?id=578682"));
-        testRipper(ripper);
-    }
-
-    public void testImagebamRip() throws IOException {
-        AbstractRipper ripper = new ImagebamRipper(new URL("http://www.imagebam.com/gallery/488cc796sllyf7o5srds8kpaz1t4m78i"));
-        testRipper(ripper);
-    }
-
-    /*
-    public void testImagestashRip() throws IOException {
-        AbstractRipper ripper = new ImagestashRipper(new URL("https://imagestash.org/tag/everydayuncensor"));
-        testRipper(ripper);
-    }
-    */
-
-    public void testImagevenueRip() throws IOException {
-        AbstractRipper ripper = new ImagevenueRipper(new URL("http://img120.imagevenue.com/galshow.php?gal=gallery_1373818527696_191lo"));
-        testRipper(ripper);
-    }
-
-    public void testImgboxRip() throws IOException {
-        AbstractRipper ripper = new ImgboxRipper(new URL("https://imgbox.com/g/FJPF7t26FD"));
-        testRipper(ripper);
-    }
-
-    /*
-    public void testMinusUserRip() throws IOException {
-        AbstractRipper ripper = new MinusRipper(new URL("http://vampyr3.minus.com/"));
-        testRipper(ripper);
-        deleteSubdirs(ripper.getWorkingDir());
-        deleteDir(ripper.getWorkingDir());
-    }
-    public void testMinusUserAlbumRip() throws IOException {
-        AbstractRipper ripper = new MinusRipper(new URL("http://vampyr3.minus.com/mw7ztQ6xzP7ae"));
-        testRipper(ripper);
-    }
-    public void testMinusUserUploadsRip() throws IOException {
-        AbstractRipper ripper = new MinusRipper(new URL("http://vampyr3.minus.com/uploads"));
-        testRipper(ripper);
-    }
-    public void testMinusAlbumRip() throws IOException {
-        AbstractRipper ripper = new MinusRipper(new URL("http://minus.com/mw7ztQ6xzP7ae"));
-        testRipper(ripper);
-    }
-    */
-
-    public void testModelmayhemRip() throws IOException {
-        AbstractRipper ripper = new ModelmayhemRipper(new URL("https://www.modelmayhem.com/portfolio/520206/viewall"));
-        testRipper(ripper);
-    }
-
-    public void testPichunterRip() throws IOException {
-        // A non-photoset
-        AbstractRipper ripper = new PichunterRipper(new URL("https://www.pichunter.com/models/Madison_Ivy"));
-        testRipper(ripper);
-        // a photo set
-        ripper = new PichunterRipper(new URL("http://www.pichunter.com/gallery/3270642/Its_not_only_those_who"));
-        testRipper(ripper);
-
-    }
-
-    public void testMotherlessAlbumRip() throws IOException {
-        MotherlessRipper ripper = new MotherlessRipper(new URL("http://motherless.com/G4DAA18D"));
-        testRipper(ripper);
-    }
-
-    public void testNfsfwRip() throws IOException {
-        AbstractRipper ripper = new NfsfwRipper(new URL("http://nfsfw.com/gallery/v/Kitten/"));
-        testRipper(ripper);
-    }
-
-    /*
-    // https://github.com/RipMeApp/ripme/issues/229 : Disabled test (temporary) : BasicRippersTest#testPhotobucketRip (timing out)
-    public void testPhotobucketRip() throws IOException {
-        AbstractRipper ripper = new PhotobucketRipper(new URL("http://s844.photobucket.com/user/SpazzySpizzy/library/Album%20Covers?sort=3&page=1"));
-        testRipper(ripper);
-        deleteSubdirs(ripper.getWorkingDir());
-        deleteDir(ripper.getWorkingDir());
-    }
-    */
-
-    public void testPornhubRip() throws IOException {
-        AbstractRipper ripper = new PornhubRipper(new URL("https://www.pornhub.com/album/15680522"));
-        testRipper(ripper);
-    }
-
-    public void testTheyiffgallery() throws IOException {
-        AbstractRipper ripper = new TheyiffgalleryRipper(new URL("https://theyiffgallery.com/index?/category/4303"));
-        testRipper(ripper);
-    }
-
-    /*
-    public void testSankakuChanRip() throws IOException {
-        AbstractRipper ripper = new SankakuComplexRipper(new URL("https://chan.sankakucomplex.com/?tags=cleavage"));
-        testRipper(ripper);
-    }
-    public void testSankakuIdolRip() throws IOException {
-        AbstractRipper ripper = new SankakuComplexRipper(new URL("https://idol.sankakucomplex.com/?tags=meme_%28me%21me%21me%21%29_%28cosplay%29"));
-        testRipper(ripper);
-    }
-    */
-
-    public void testShesFreakyRip() throws IOException {
-        AbstractRipper ripper = new ShesFreakyRipper(new URL("http://www.shesfreaky.com/gallery/nicee-snow-bunny-579NbPjUcYa.html"));
-        testRipper(ripper);
-    }
-
-    public void testTapasticRip() throws IOException {
-        AbstractRipper ripper = new TapasticRipper(new URL("http://tapastic.com/episode/2139"));
-        testRipper(ripper);
-    }
-
-    public void testTeenplanetRip() throws IOException {
-        AbstractRipper ripper = new TeenplanetRipper(new URL("http://teenplanet.org/galleries/the-perfect-side-of-me-6588.html"));
-        testRipper(ripper);
-    }
-
-    /*
-    public void testTwodgalleriesRip() throws IOException {
-        AbstractRipper ripper = new TwodgalleriesRipper(new URL("http://www.2dgalleries.com/artist/regis-loisel-6477"));
-        testRipper(ripper);
-    }
-    */
-
-    public void testVidbleRip() throws IOException {
-        AbstractRipper ripper = new VidbleRipper(new URL("http://www.vidble.com/album/y1oyh3zd"));
-        testRipper(ripper);
-    }
-
-    /*
-    public void testVineRip() throws IOException {
-        AbstractRipper ripper = new VineRipper(new URL("https://vine.co/u/954440445776334848"));
-        testRipper(ripper);
-    }
-    */
-
-    public void testVkSubalbumRip() throws IOException {
-        VkRipper ripper = new VkRipper(new URL("http://vk.com/album45506334_0"));
-        testRipper(ripper);
-    }
-    public void testVkRootAlbumRip() throws IOException {
-        VkRipper ripper = new VkRipper(new URL("https://vk.com/album45506334_0"));
-        testRipper(ripper);
-    }
-    public void testVkPhotosRip() throws IOException {
-        VkRipper ripper = new VkRipper(new URL("https://vk.com/photos45506334"));
-        testRipper(ripper);
-    }
-
-    // https://github.com/RipMeApp/ripme/issues/206 : Disabled test : BasicRippersTest#testXhamsterAlbums -- fix and re-enable
-    // public void testXhamsterAlbums() throws IOException {
-    //     XhamsterRipper ripper = new XhamsterRipper(new URL("https://xhamster.com/photos/gallery/sexy-preggo-girls-9026608"));
-    //     testRipper(ripper);
-    // }
-}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/DeviantartRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/DeviantartRipperTest.java
new file mode 100644
index 00000000..a3fdfd81
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/DeviantartRipperTest.java
@@ -0,0 +1,19 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.DeviantartRipper;
+
+public class DeviantartRipperTest extends RippersTest {
+    public void testDeviantartAlbum() throws IOException {
+        DeviantartRipper ripper = new DeviantartRipper(new URL("http://airgee.deviantart.com/gallery/"));
+        testRipper(ripper);
+    }
+
+    public void testDeviantartNSFWAlbum() throws IOException {
+        // NSFW gallery
+        DeviantartRipper ripper = new DeviantartRipper(new URL("http://faterkcx.deviantart.com/gallery/"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java
new file mode 100644
index 00000000..068f9a81
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.EightmusesRipper;
+
+public class EightmusesRipperTest extends RippersTest {
+    public void testEightmusesAlbum() throws IOException {
+        EightmusesRipper ripper = new EightmusesRipper(new URL("https://www.8muses.com/album/jab-comics/a-model-life"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FineboxRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FineboxRipperTest.java
new file mode 100644
index 00000000..6c55efd1
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FineboxRipperTest.java
@@ -0,0 +1,22 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.FineboxRipper;
+
+public class FineboxRipperTest extends RippersTest {
+    /*
+    public void testVineboxAlbum() throws IOException {
+        FineboxRipper ripper = new FineboxRipper(new URL("http://vinebox.co/u/wi57hMjc2Ka"));
+        testRipper(ripper);
+    }
+    */
+
+    /*
+    public void testFineboxAlbum() throws IOException {
+        FineboxRipper ripper = new FineboxRipper(new URL("http://finebox.co/u/wi57hMjc2Ka"));
+        testRipper(ripper);
+    }
+    */
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FivehundredpxRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FivehundredpxRipperTest.java
new file mode 100644
index 00000000..538d493c
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FivehundredpxRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.FivehundredpxRipper;
+
+public class FivehundredpxRipperTest extends RippersTest {
+    public void test500pxAlbum() throws IOException {
+        FivehundredpxRipper ripper = new FivehundredpxRipper(new URL("https://marketplace.500px.com/alexander_hurman"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FlickrRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FlickrRipperTest.java
new file mode 100644
index 00000000..5172d5a4
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FlickrRipperTest.java
@@ -0,0 +1,15 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.FlickrRipper;
+
+public class FlickrRipperTest extends RippersTest {
+    /*
+    public void testFlickrAlbum() throws IOException {
+        FlickrRipper ripper = new FlickrRipper(new URL("https://www.flickr.com/photos/leavingallbehind/sets/72157621895942720/"));
+        testRipper(ripper);
+    }
+    */
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FuraffinityRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FuraffinityRipperTest.java
new file mode 100644
index 00000000..a88c7a28
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FuraffinityRipperTest.java
@@ -0,0 +1,15 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.FuraffinityRipper;
+
+public class FuraffinityRipperTest extends RippersTest {
+    /*
+    public void testFuraffinityAlbum() throws IOException {
+        FuraffinityRipper ripper = new FuraffinityRipper(new URL("https://www.furaffinity.net/gallery/mustardgas/"));
+        testRipper(ripper);
+    }
+    */
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FuskatorRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FuskatorRipperTest.java
new file mode 100644
index 00000000..290cc4aa
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FuskatorRipperTest.java
@@ -0,0 +1,15 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.FuskatorRipper;
+
+public class FuskatorRipperTest extends RippersTest {
+    /*
+    public void testFuskatorAlbum() throws IOException {
+        FuskatorRipper ripper = new FuskatorRipper(new URL("http://fuskator.com/full/emJa1U6cqbi/index.html"));
+        testRipper(ripper);
+    }
+    */
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/GirlsOfDesireRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/GirlsOfDesireRipperTest.java
new file mode 100644
index 00000000..fa51a262
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/GirlsOfDesireRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.GirlsOfDesireRipper;
+
+public class GirlsOfDesireRipperTest extends RippersTest {
+    public void testGirlsofdesireAlbum() throws IOException {
+        GirlsOfDesireRipper ripper = new GirlsOfDesireRipper(new URL("http://www.girlsofdesire.org/galleries/krillia/"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/HentaifoundryRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/HentaifoundryRipperTest.java
new file mode 100644
index 00000000..9dadbd27
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/HentaifoundryRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.HentaifoundryRipper;
+
+public class HentaifoundryRipperTest extends RippersTest {
+    public void testHentaifoundryRip() throws IOException {
+        HentaifoundryRipper ripper = new HentaifoundryRipper(new URL("http://www.hentai-foundry.com/pictures/user/personalami"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagearnRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagearnRipperTest.java
new file mode 100644
index 00000000..b9710635
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagearnRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.ImagearnRipper;
+
+public class ImagearnRipperTest extends RippersTest {
+    public void testImagearnRip() throws IOException {
+        ImagearnRipper ripper = new ImagearnRipper(new URL("http://imagearn.com//gallery.php?id=578682"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagebamRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagebamRipperTest.java
new file mode 100644
index 00000000..0c3e0761
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagebamRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.ImagebamRipper;
+
+public class ImagebamRipperTest extends RippersTest {
+    public void testImagebamRip() throws IOException {
+        ImagebamRipper ripper = new ImagebamRipper(new URL("http://www.imagebam.com/gallery/488cc796sllyf7o5srds8kpaz1t4m78i"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagestashRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagestashRipperTest.java
new file mode 100644
index 00000000..f6776ef2
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagestashRipperTest.java
@@ -0,0 +1,15 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.ImagestashRipper;
+
+public class ImagestashRipperTest extends RippersTest {
+    /*
+    public void testImagestashRip() throws IOException {
+        ImagestashRipper ripper = new ImagestashRipper(new URL("https://imagestash.org/tag/everydayuncensor"));
+        testRipper(ripper);
+    }
+    */
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagevenueRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagevenueRipperTest.java
new file mode 100644
index 00000000..135a7b0a
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagevenueRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.ImagevenueRipper;
+
+public class ImagevenueRipperTest extends RippersTest {
+    public void testImagevenueRip() throws IOException {
+        ImagevenueRipper ripper = new ImagevenueRipper(new URL("http://img120.imagevenue.com/galshow.php?gal=gallery_1373818527696_191lo"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImgboxRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImgboxRipperTest.java
new file mode 100644
index 00000000..db8e1680
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImgboxRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.ImgboxRipper;
+
+public class ImgboxRipperTest extends RippersTest {
+    public void testImgboxRip() throws IOException {
+        ImgboxRipper ripper = new ImgboxRipper(new URL("https://imgbox.com/g/FJPF7t26FD"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ModelmayhemRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ModelmayhemRipperTest.java
new file mode 100644
index 00000000..621d77c3
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ModelmayhemRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.ModelmayhemRipper;
+
+public class ModelmayhemRipperTest extends RippersTest {
+    public void testModelmayhemRip() throws IOException {
+        ModelmayhemRipper ripper = new ModelmayhemRipper(new URL("https://www.modelmayhem.com/portfolio/520206/viewall"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MotherlessRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MotherlessRipperTest.java
new file mode 100644
index 00000000..391cc3c9
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MotherlessRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.MotherlessRipper;
+
+public class MotherlessRipperTest extends RippersTest {
+    public void testMotherlessAlbumRip() throws IOException {
+        MotherlessRipper ripper = new MotherlessRipper(new URL("http://motherless.com/G4DAA18D"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/NfsfwRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/NfsfwRipperTest.java
new file mode 100644
index 00000000..bc0d4908
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/NfsfwRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.NfsfwRipper;
+
+public class NfsfwRipperTest extends RippersTest {
+    public void testNfsfwRip() throws IOException {
+        NfsfwRipper ripper = new NfsfwRipper(new URL("http://nfsfw.com/gallery/v/Kitten/"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PhotobucketRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PhotobucketRipperTest.java
new file mode 100644
index 00000000..dff101a0
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PhotobucketRipperTest.java
@@ -0,0 +1,21 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.PhotobucketRipper;
+
+public class PhotobucketRipperTest extends RippersTest {
+    /*
+    // https://github.com/RipMeApp/ripme/issues/229 : Disabled test (temporary) : BasicRippersTest#testPhotobucketRip (timing out)
+    public void testPhotobucketRip() throws IOException {
+        PhotobucketRipper ripper = new PhotobucketRipper(new URL("http://s844.photobucket.com/user/SpazzySpizzy/library/Album%20Covers?sort=3&page=1"));
+        testRipper(ripper);
+        deleteSubdirs(ripper.getWorkingDir());
+        deleteDir(ripper.getWorkingDir());
+    }
+    */
+}
+
+
+
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PichunterRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PichunterRipperTest.java
new file mode 100644
index 00000000..43d70884
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PichunterRipperTest.java
@@ -0,0 +1,20 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.PichunterRipper;
+
+public class PichunterRipperTest extends RippersTest {
+    public void testPichunterModelPageRip() throws IOException {
+        // A non-photoset
+        PichunterRipper ripper = new PichunterRipper(new URL("https://www.pichunter.com/models/Madison_Ivy"));
+        testRipper(ripper);
+    }
+
+    public void testPichunterGalleryRip() throws IOException {
+        // a photo set
+        PichunterRipper ripper = new PichunterRipper(new URL("http://www.pichunter.com/gallery/3270642/Its_not_only_those_who"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PornhubRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PornhubRipperTest.java
new file mode 100644
index 00000000..96685cbc
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PornhubRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.PornhubRipper;
+
+public class PornhubRipperTest extends RippersTest {
+    public void testPornhubRip() throws IOException {
+        PornhubRipper ripper = new PornhubRipper(new URL("https://www.pornhub.com/album/15680522"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/RedditRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/RedditRipperTest.java
new file mode 100644
index 00000000..49936e17
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/RedditRipperTest.java
@@ -0,0 +1,24 @@
+
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.RedditRipper;
+
+public class RedditRipperTest extends RippersTest {
+    /*
+    public void testRedditSubredditRip() throws IOException {
+        RedditRipper ripper = new RedditRipper(new URL("http://www.reddit.com/r/nsfw_oc"));
+        testRipper(ripper);
+    }
+    public void testRedditSubredditTopRip() throws IOException {
+        RedditRipper ripper = new RedditRipper(new URL("http://www.reddit.com/r/nsfw_oc/top?t=all"));
+        testRipper(ripper);
+    }
+    public void testRedditPostRip() throws IOException {
+        RedditRipper ripper = new RedditRipper(new URL("http://www.reddit.com/r/UnrealGirls/comments/1ziuhl/in_class_veronique_popa/"));
+        testRipper(ripper);
+    }
+    */
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/SankakuComplexRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/SankakuComplexRipperTest.java
new file mode 100644
index 00000000..e0027a00
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/SankakuComplexRipperTest.java
@@ -0,0 +1,19 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.SankakuComplexRipper;
+
+public class SankakuComplexRipperTest extends RippersTest {
+    /*
+    public void testSankakuChanRip() throws IOException {
+        SankakuComplexRipper ripper = new SankakuComplexRipper(new URL("https://chan.sankakucomplex.com/?tags=cleavage"));
+        testRipper(ripper);
+    }
+    public void testSankakuIdolRip() throws IOException {
+        SankakuComplexRipper ripper = new SankakuComplexRipper(new URL("https://idol.sankakucomplex.com/?tags=meme_%28me%21me%21me%21%29_%28cosplay%29"));
+        testRipper(ripper);
+    }
+    */
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ShesFreakyRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ShesFreakyRipperTest.java
new file mode 100644
index 00000000..aca763ce
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ShesFreakyRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.ShesFreakyRipper;
+
+public class ShesFreakyRipperTest extends RippersTest {
+    public void testShesFreakyRip() throws IOException {
+        ShesFreakyRipper ripper = new ShesFreakyRipper(new URL("http://www.shesfreaky.com/gallery/nicee-snow-bunny-579NbPjUcYa.html"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TapasticRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TapasticRipperTest.java
new file mode 100644
index 00000000..efef40cd
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TapasticRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.TapasticRipper;
+
+public class TapasticRipperTest extends RippersTest {
+    public void testTapasticRip() throws IOException {
+        TapasticRipper ripper = new TapasticRipper(new URL("http://tapastic.com/episode/2139"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TeenplanetRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TeenplanetRipperTest.java
new file mode 100644
index 00000000..aa43103b
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TeenplanetRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.TeenplanetRipper;
+
+public class TeenplanetRipperTest extends RippersTest {
+    public void testTeenplanetRip() throws IOException {
+        TeenplanetRipper ripper = new TeenplanetRipper(new URL("http://teenplanet.org/galleries/the-perfect-side-of-me-6588.html"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TheyiffgalleryRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TheyiffgalleryRipperTest.java
new file mode 100644
index 00000000..3c7a8fbd
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TheyiffgalleryRipperTest.java
@@ -0,0 +1,13 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.TheyiffgalleryRipper;
+
+public class TheyiffgalleryRipperTest extends RippersTest {
+    public void testTheyiffgallery() throws IOException {
+        TheyiffgalleryRipper ripper = new TheyiffgalleryRipper(new URL("https://theyiffgallery.com/index?/category/4303"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TumblrRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TumblrRipperTest.java
new file mode 100644
index 00000000..2c0dc405
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TumblrRipperTest.java
@@ -0,0 +1,24 @@
+
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.TumblrRipper;
+
+public class TumblrRipperTest extends RippersTest {
+    /*
+    public void testTumblrFullRip() throws IOException {
+        TumblrRipper ripper = new TumblrRipper(new URL("http://wrouinr.tumblr.com/archive"));
+        testRipper(ripper);
+    }
+    public void testTumblrTagRip() throws IOException {
+        TumblrRipper ripper = new TumblrRipper(new URL("http://topinstagirls.tumblr.com/tagged/berlinskaya"));
+        testRipper(ripper);
+    }
+    public void testTumblrPostRip() throws IOException {
+        TumblrRipper ripper = new TumblrRipper(new URL("http://sadbaffoon.tumblr.com/post/132045920789/what-a-hoe"));
+        testRipper(ripper);
+    }
+    */
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TwitterRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TwitterRipperTest.java
new file mode 100644
index 00000000..c29a482d
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TwitterRipperTest.java
@@ -0,0 +1,20 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.TwitterRipper;
+
+public class TwitterRipperTest extends RippersTest {
+    public void testTwitterUserRip() throws IOException {
+        TwitterRipper ripper = new TwitterRipper(new URL("https://twitter.com/danngamber01/media"));
+        testRipper(ripper);
+    }
+
+    /*
+    public void testTwitterSearchRip() throws IOException {
+        TwitterRipper ripper = new TwitterRipper(new URL("https://twitter.com/search?q=from%3ADaisyfairymfc%20filter%3Aimages&src=typd"));
+        testRipper(ripper);
+    }
+    */
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TwodgalleriesRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TwodgalleriesRipperTest.java
new file mode 100644
index 00000000..09af04ee
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/TwodgalleriesRipperTest.java
@@ -0,0 +1,16 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.TwodgalleriesRipper;
+
+public class TwodgalleriesRipperTest extends RippersTest {
+    /*
+    public void testTwodgalleriesRip() throws IOException {
+        TwodgalleriesRipper ripper = new TwodgalleriesRipper(new URL("http://www.2dgalleries.com/artist/regis-loisel-6477"));
+        testRipper(ripper);
+    }
+    */
+}
+
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VidbleRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VidbleRipperTest.java
new file mode 100644
index 00000000..ccbeb8bb
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VidbleRipperTest.java
@@ -0,0 +1,14 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.VidbleRipper;
+
+public class VidbleRipperTest extends RippersTest {
+    public void testVidbleRip() throws IOException {
+        VidbleRipper ripper = new VidbleRipper(new URL("http://www.vidble.com/album/y1oyh3zd"));
+        testRipper(ripper);
+    }
+}
+
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VineRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VineRipperTest.java
new file mode 100644
index 00000000..ae8ac402
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VineRipperTest.java
@@ -0,0 +1,15 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.VineRipper;
+
+public class VineRipperTest extends RippersTest {
+    /*
+    public void testVineRip() throws IOException {
+        VineRipper ripper = new VineRipper(new URL("https://vine.co/u/954440445776334848"));
+        testRipper(ripper);
+    }
+    */
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VkRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VkRipperTest.java
new file mode 100644
index 00000000..77c5f44f
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VkRipperTest.java
@@ -0,0 +1,27 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.VkRipper;
+
+public class VkRipperTest extends RippersTest {
+    // Not supported (error): https://vk.com/helga_model (Profile Page)
+    // Not supported (rips nothing): https://vk.com/albums45506334 (all albums under a Profile Page)
+    // EXAMPLE: https://vk.com/photos45506334 (all photos for a model)
+    // EXAMPLE: https://vk.com/album45506334_0 (a single album - profile pictures)
+    // EXAMPLE: https://vk.com/album45506334_00?rev=1 (a single album - wall pictures)
+    // EXAMPLE: https://vk.com/album45506334_101886701 (a single album - custom)
+    public void testVkAlbumHttpRip() throws IOException {
+        VkRipper ripper = new VkRipper(new URL("http://vk.com/album45506334_0"));
+        testRipper(ripper);
+    }
+    public void testVkAlbumHttpsRip() throws IOException {
+        VkRipper ripper = new VkRipper(new URL("https://vk.com/album45506334_0"));
+        testRipper(ripper);
+    }
+    public void testVkPhotosRip() throws IOException {
+        VkRipper ripper = new VkRipper(new URL("https://vk.com/photos45506334"));
+        testRipper(ripper);
+    }
+}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/XhamsterRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/XhamsterRipperTest.java
new file mode 100644
index 00000000..74e5818f
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/XhamsterRipperTest.java
@@ -0,0 +1,14 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.XhamsterRipper;
+
+public class XhamsterRipperTest extends RippersTest {
+    // https://github.com/RipMeApp/ripme/issues/206 : Disabled test : BasicRippersTest#testXhamsterAlbums -- fix and re-enable
+    // public void testXhamsterAlbums() throws IOException {
+    //     XhamsterRipper ripper = new XhamsterRipper(new URL("https://xhamster.com/photos/gallery/sexy-preggo-girls-9026608"));
+    //     testRipper(ripper);
+    // }
+}