diff --git a/core/src/main/java/com/google/bitcoin/core/TransactionOutPoint.java b/core/src/main/java/com/google/bitcoin/core/TransactionOutPoint.java
index 5ee25003..2a9dca56 100644
--- a/core/src/main/java/com/google/bitcoin/core/TransactionOutPoint.java
+++ b/core/src/main/java/com/google/bitcoin/core/TransactionOutPoint.java
@@ -169,25 +169,16 @@ public class TransactionOutPoint extends ChildMessage implements Serializable {
         return hash;
     }
 
-    /**
-     * @param hash the hash to set
-     */
     void setHash(Sha256Hash hash) {
         this.hash = hash;
     }
 
-    /**
-     * @return the index
-     */
     public long getIndex() {
         maybeParse();
         return index;
     }
     
-    /**
-     * @param index the index to set
-     */
-    void setIndex(long index) {
+    public void setIndex(long index) {
         this.index = index;
     }
 
diff --git a/core/src/test/java/com/google/bitcoin/core/ScriptTest.java b/core/src/test/java/com/google/bitcoin/script/ScriptTest.java
similarity index 99%
rename from core/src/test/java/com/google/bitcoin/core/ScriptTest.java
rename to core/src/test/java/com/google/bitcoin/script/ScriptTest.java
index 780a8690..220b12ef 100644
--- a/core/src/test/java/com/google/bitcoin/core/ScriptTest.java
+++ b/core/src/test/java/com/google/bitcoin/script/ScriptTest.java
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.bitcoin.core;
+package com.google.bitcoin.script;
 
+import com.google.bitcoin.core.*;
 import com.google.bitcoin.script.Script;
 import com.google.bitcoin.script.ScriptOpCodes;
 import com.google.common.collect.Lists;