diff --git a/graphenej/src/test/java/cy/agorise/graphenej/operations/CreateHtlcOperationTest.java b/graphenej/src/test/java/cy/agorise/graphenej/operations/CreateHtlcOperationTest.java
index f33bc7b..3a322b5 100644
--- a/graphenej/src/test/java/cy/agorise/graphenej/operations/CreateHtlcOperationTest.java
+++ b/graphenej/src/test/java/cy/agorise/graphenej/operations/CreateHtlcOperationTest.java
@@ -1,21 +1,32 @@
 package cy.agorise.graphenej.operations;
 
+import com.google.common.primitives.Bytes;
 import com.google.common.primitives.UnsignedLong;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.security.NoSuchAlgorithmException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.TimeZone;
 
 import cy.agorise.graphenej.Asset;
 import cy.agorise.graphenej.AssetAmount;
+import cy.agorise.graphenej.BaseOperation;
+import cy.agorise.graphenej.BlockData;
+import cy.agorise.graphenej.Chains;
 import cy.agorise.graphenej.HtlcHash;
 import cy.agorise.graphenej.HtlcHashType;
+import cy.agorise.graphenej.Transaction;
 import cy.agorise.graphenej.UserAccount;
 import cy.agorise.graphenej.Util;
 
 public class CreateHtlcOperationTest {
     private final String SERIALIZED_OP = "0000000000000000007b7c80241100000000000000a06e327ea7388c18e4740e350ed4e60f2e04fc41c8007800000000";
+    private final String SERIALIZED_TX = "f68585abf4dce7c8045701310000000000000000007b7c80241100000000000000a06e327ea7388c18e4740e350ed4e60f2e04fc41c800780000000000";
     private final String PREIMAGE_HEX = "666f6f626172";
     private final String HASH_RIPEMD160 = "a06e327ea7388c18e4740e350ed4e60f2e04fc41";
     private final String HASH_SHA1 = "8843d7f92416211de9ebb963ff4ce28125932878";
@@ -23,6 +34,16 @@ public class CreateHtlcOperationTest {
 
     private final Asset CORE = new Asset("1.3.0");
 
+    private CreateHtlcOperation buildCreateHtlcOperation() throws NoSuchAlgorithmException {
+        UserAccount from = new UserAccount("1.2.123");
+        UserAccount to = new UserAccount("1.2.124");
+        AssetAmount fee = new AssetAmount(UnsignedLong.valueOf(0), CORE);
+        AssetAmount amount = new AssetAmount(UnsignedLong.valueOf(1123456), CORE);
+        byte[] hashBytes = Util.htlcHash("foobar".getBytes(), HtlcHashType.RIPEMD160);
+        HtlcHash preimageHash = new HtlcHash(HtlcHashType.RIPEMD160, hashBytes);
+        return new CreateHtlcOperation(fee, from, to, amount, preimageHash, (short) 200, 120);
+    }
+
     @Test
     public void testRipemd160(){
         try {
@@ -58,14 +79,22 @@ public class CreateHtlcOperationTest {
 
     @Test
     public void testOperationSerialization() throws NoSuchAlgorithmException {
-        UserAccount from = new UserAccount("1.2.123");
-        UserAccount to = new UserAccount("1.2.124");
-        AssetAmount fee = new AssetAmount(UnsignedLong.valueOf(0), CORE);
-        AssetAmount amount = new AssetAmount(UnsignedLong.valueOf(1123456), CORE);
-        byte[] hashBytes = Util.htlcHash("foobar".getBytes(), HtlcHashType.RIPEMD160);
-        HtlcHash preimageHash = new HtlcHash(HtlcHashType.RIPEMD160, hashBytes);
-        CreateHtlcOperation operation = new CreateHtlcOperation(fee, from, to, amount, preimageHash, (short) 200, 120);
+        CreateHtlcOperation operation = this.buildCreateHtlcOperation();
         byte[] opBytes = operation.toBytes();
         Assert.assertArrayEquals(Util.hexToBytes(SERIALIZED_OP), opBytes);
     }
+
+    @Test
+    public void testTransactionSerialization() throws NoSuchAlgorithmException, ParseException {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+        dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+        Date expirationDate = dateFormat.parse("2016-04-06T08:29:27");
+        BlockData blockData = new BlockData(34294, 3707022213L, (expirationDate.getTime() / 1000));
+        ArrayList<BaseOperation> operations = new ArrayList<>();
+        operations.add(buildCreateHtlcOperation());
+        Transaction transaction = new Transaction(blockData, operations);
+        byte[] txBytes = transaction.toBytes();
+        byte[] expected = Bytes.concat(Util.hexToBytes(Chains.BITSHARES.CHAIN_ID), Util.hexToBytes(SERIALIZED_TX));
+        Assert.assertArrayEquals(expected, txBytes);
+    }
 }