diff --git a/src/scratchpad/testcases/dummy.txt b/poi-scratchpad/src/test/java/dummy.txt
similarity index 100%
rename from src/scratchpad/testcases/dummy.txt
rename to poi-scratchpad/src/test/java/dummy.txt
diff --git a/src/scratchpad/testcases/log4j.properties b/poi-scratchpad/src/test/java/log4j.properties
similarity index 100%
rename from src/scratchpad/testcases/log4j.properties
rename to poi-scratchpad/src/test/java/log4j.properties
diff --git a/src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java b/poi-scratchpad/src/test/java/org/apache/poi/TestPOIDocumentScratchpad.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java
rename to poi-scratchpad/src/test/java/org/apache/poi/TestPOIDocumentScratchpad.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdf/model/TestHDFDocument.java b/poi-scratchpad/src/test/java/org/apache/poi/hdf/model/TestHDFDocument.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hdf/model/TestHDFDocument.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hdf/model/TestHDFDocument.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFCore.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFCore.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFLZW.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFLZW.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFLZW.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFLZW.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/chunks/TestChunks.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/chunks/TestChunks.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hdgf/chunks/TestChunks.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hdgf/chunks/TestChunks.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/pointers/TestPointerFactory.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/pointers/TestPointerFactory.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hdgf/pointers/TestPointerFactory.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hdgf/pointers/TestPointerFactory.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/StreamTest.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/StreamTest.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hdgf/streams/StreamTest.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/StreamTest.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBasics.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBasics.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBasics.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBasics.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBugs.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBugs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamComplex.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamComplex.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/HMEFTest.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/HMEFTest.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hmef/HMEFTest.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hmef/HMEFTest.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestAttachments.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hmef/TestAttachments.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestBugs.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestBugs.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hmef/TestBugs.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hmef/TestBugs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestCompressedRTF.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hmef/TestCompressedRTF.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestHMEFMessage.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hmef/TestHMEFMessage.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/TestHPBFDocument.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hpbf/TestHPBFDocument.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/model/TestEscherParts.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hpbf/model/TestEscherParts.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/model/TestQuillContents.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hpbf/model/TestQuillContents.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/AllHSLFTests.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/AllHSLFTests.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/AllHSLFTests.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/AllHSLFTests.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/HSLFTestDataSamples.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/HSLFTestDataSamples.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestEncryptedFile.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/TestEncryptedFile.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestReWrite.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/TestReWrite.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestReWriteSanity.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/TestReWriteSanity.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestRecordCounts.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/TestRecordCounts.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/AllHSLFModelTests.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/AllHSLFModelTests.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/AllHSLFModelTests.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestBackground.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestBackground.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestFreeform.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestFreeform.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestHeadersFooters.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestHeadersFooters.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestHyperlink.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestHyperlink.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestImagePainter.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestImagePainter.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestImagePainter.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestImagePainter.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestLine.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestLine.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestMovieShape.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestMovieShape.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestOleEmbedding.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestOleEmbedding.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPFont.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPFont.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPGraphics2D.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPGraphics2D.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestPicture.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestPicture.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSetBoldItalic.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSetBoldItalic.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSheet.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSheet.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideChangeNotes.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideChangeNotes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideMaster.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideMaster.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlides.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlides.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTable.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRun.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRun.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRunReWrite.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRunReWrite.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextShape.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextShape.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/AllHSLFRecordTests.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/AllHSLFRecordTests.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/AllHSLFRecordTests.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/AllHSLFRecordTests.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestAnimationInfoAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCString.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestCString.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestCString.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestCString.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestColorSchemeAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestColorSchemeAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestColorSchemeAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestColorSchemeAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000Atom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000Atom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000Atom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000Atom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestCurrentUserAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestCurrentUserAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocument.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocument.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlink.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlink.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExMediaAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExMediaAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjList.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjList.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjListAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjListAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjStg.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjStg.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExVideoContainer.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExVideoContainer.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfo.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfo.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestNotesAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestNotesAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordContainer.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordContainer.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordTypes.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordTypes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlideAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlideAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlidePersistAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlidePersistAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSound.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSound.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextBytesAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextBytesAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextCharsAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextCharsAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextHeaderAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextHeaderAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestUserEditAtom.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestUserEditAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/AllHSLFUserModelTests.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/AllHSLFUserModelTests.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/AllHSLFUserModelTests.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/AllHSLFUserModelTests.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestAddingSlides.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestAddingSlides.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBugs.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBugs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestCounts.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestCounts.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestFontRendering.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestFontRendering.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNotesText.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNotesText.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList2.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList2.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList3.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList3.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPictures.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPictures.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRecordSetup.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRecordSetup.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRichTextRun.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRichTextRun.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSheetText.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSheetText.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSoundData.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSoundData.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTable.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/util/TestSystemTimeUtils.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hslf/util/TestSystemTimeUtils.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/AllHSMFTests.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/AllHSMFTests.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/AllHSMFTests.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/AllHSMFTests.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestBasics.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestBasics.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestBlankFileRead.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestBlankFileRead.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestFixedSizedProperties.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestFixedSizedProperties.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestOutlook30FileRead.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestOutlook30FileRead.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestSimpleFileRead.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestSimpleFileRead.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestChunkData.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestChunkData.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestSorters.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestSorters.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestTypes.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestTypes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java b/poi-scratchpad/src/test/java/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java b/poi-scratchpad/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFChart.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFChart.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/AllHWPFTests.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/AllHWPFTests.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/AllHWPFTests.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/AllHWPFTests.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFDocFixture.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFDocFixture.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestCase.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestCase.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestDataSamples.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestDataSamples.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestFieldsTables.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestFieldsTables.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFPictures.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFPictures.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFRangeParts.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFRangeParts.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestNumberFormatter.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestNumberFormatter.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractor.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestBookmarksTables.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestBookmarksTables.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestCHPBinTable.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestCHPBinTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestDocumentProperties.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestDocumentProperties.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFileInformationBlock.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFileInformationBlock.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFontTable.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFontTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestListTables.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestListTables.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestNotesTables.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestNotesTables.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPAPBinTable.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPAPBinTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSavedByTable.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSavedByTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSectionTable.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSectionTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestStyleSheet.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestStyleSheet.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestTextPieceTable.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestTextPieceTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TestSprms.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TestSprms.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBorderCode.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBorderCode.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug46610.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug46610.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug47563.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug47563.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug49820.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug49820.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug50075.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug50075.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBugs.java
similarity index 99%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBugs.java
index ba4d1b754..cfdd29ad6 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBugs.java
@@ -75,7 +75,7 @@ public class TestBugs extends TestCase
 
             assertEquals( expParagraph.text(), actParagraph.text() );
             assertEquals( "Diffent isInTable flags for paragraphs #" + p
-                    + " -- " + expParagraph + " -- " + actParagraph + ".",
+                    + " -- " + expParagraph + " -- " + actParagraph + "",
                     expParagraph.isInTable(), actParagraph.isInTable() );
             assertEquals( expParagraph.isTableRowEnd(),
                     actParagraph.isTableRowEnd() );
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestLists.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestLists.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestProblems.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestProblems.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestShapes.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestShapes.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestShapes.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestShapes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestTableRow.java
similarity index 100%
rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java
rename to poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestTableRow.java