diff --git a/src/bin_client/test/contracts/swap_left_right.tz b/src/bin_client/test/contracts_opcode/left_right.tz
similarity index 100%
rename from src/bin_client/test/contracts/swap_left_right.tz
rename to src/bin_client/test/contracts_opcode/left_right.tz
diff --git a/src/bin_client/test/contracts/list_iter2.tz b/src/bin_client/test/contracts_opcode/list_concat.tz
similarity index 100%
rename from src/bin_client/test/contracts/list_iter2.tz
rename to src/bin_client/test/contracts_opcode/list_concat.tz
diff --git a/src/bin_client/test/contracts/list_iter2_bytes.tz b/src/bin_client/test/contracts_opcode/list_concat_bytes.tz
similarity index 100%
rename from src/bin_client/test/contracts/list_iter2_bytes.tz
rename to src/bin_client/test/contracts_opcode/list_concat_bytes.tz
diff --git a/src/bin_client/test/contracts/list_id.tz b/src/bin_client/test/contracts_opcode/list_id.tz
similarity index 100%
rename from src/bin_client/test/contracts/list_id.tz
rename to src/bin_client/test/contracts_opcode/list_id.tz
diff --git a/src/bin_client/test/contracts/list_id_map.tz b/src/bin_client/test/contracts_opcode/list_id_map.tz
similarity index 100%
rename from src/bin_client/test/contracts/list_id_map.tz
rename to src/bin_client/test/contracts_opcode/list_id_map.tz
diff --git a/src/bin_client/test/contracts/list_iter.tz b/src/bin_client/test/contracts_opcode/list_iter.tz
similarity index 100%
rename from src/bin_client/test/contracts/list_iter.tz
rename to src/bin_client/test/contracts_opcode/list_iter.tz
diff --git a/src/bin_client/test/contracts/map_car.tz b/src/bin_client/test/contracts_opcode/map_car.tz
similarity index 100%
rename from src/bin_client/test/contracts/map_car.tz
rename to src/bin_client/test/contracts_opcode/map_car.tz
diff --git a/src/bin_client/test/contracts/map_id.tz b/src/bin_client/test/contracts_opcode/map_id.tz
similarity index 100%
rename from src/bin_client/test/contracts/map_id.tz
rename to src/bin_client/test/contracts_opcode/map_id.tz
diff --git a/src/bin_client/test/contracts/map_iter.tz b/src/bin_client/test/contracts_opcode/map_iter.tz
similarity index 100%
rename from src/bin_client/test/contracts/map_iter.tz
rename to src/bin_client/test/contracts_opcode/map_iter.tz
diff --git a/src/bin_client/test/contracts/map_size.tz b/src/bin_client/test/contracts_opcode/map_size.tz
similarity index 100%
rename from src/bin_client/test/contracts/map_size.tz
rename to src/bin_client/test/contracts_opcode/map_size.tz
diff --git a/src/bin_client/test/contracts/noop.tz b/src/bin_client/test/contracts_opcode/noop.tz
similarity index 100%
rename from src/bin_client/test/contracts/noop.tz
rename to src/bin_client/test/contracts_opcode/noop.tz
diff --git a/src/bin_client/test/contracts/not.tz b/src/bin_client/test/contracts_opcode/not.tz
similarity index 100%
rename from src/bin_client/test/contracts/not.tz
rename to src/bin_client/test/contracts_opcode/not.tz
diff --git a/src/bin_client/test/contracts/or.tz b/src/bin_client/test/contracts_opcode/or.tz
similarity index 100%
rename from src/bin_client/test/contracts/or.tz
rename to src/bin_client/test/contracts_opcode/or.tz
diff --git a/src/bin_client/test/contracts/packunpack.tz b/src/bin_client/test/contracts_opcode/packunpack.tz
similarity index 100%
rename from src/bin_client/test/contracts/packunpack.tz
rename to src/bin_client/test/contracts_opcode/packunpack.tz
diff --git a/src/bin_client/test/contracts/pair_id.tz b/src/bin_client/test/contracts_opcode/pair_id.tz
similarity index 100%
rename from src/bin_client/test/contracts/pair_id.tz
rename to src/bin_client/test/contracts_opcode/pair_id.tz
diff --git a/src/bin_client/test/contracts/ret_int.tz b/src/bin_client/test/contracts_opcode/ret_int.tz
similarity index 100%
rename from src/bin_client/test/contracts/ret_int.tz
rename to src/bin_client/test/contracts_opcode/ret_int.tz
diff --git a/src/bin_client/test/contracts/reverse_loop.tz b/src/bin_client/test/contracts_opcode/reverse_loop.tz
similarity index 100%
rename from src/bin_client/test/contracts/reverse_loop.tz
rename to src/bin_client/test/contracts_opcode/reverse_loop.tz
diff --git a/src/bin_client/test/contracts/self.tz b/src/bin_client/test/contracts_opcode/self.tz
similarity index 100%
rename from src/bin_client/test/contracts/self.tz
rename to src/bin_client/test/contracts_opcode/self.tz
diff --git a/src/bin_client/test/contracts/set_car.tz b/src/bin_client/test/contracts_opcode/set_car.tz
similarity index 100%
rename from src/bin_client/test/contracts/set_car.tz
rename to src/bin_client/test/contracts_opcode/set_car.tz
diff --git a/src/bin_client/test/contracts/set_cdr.tz b/src/bin_client/test/contracts_opcode/set_cdr.tz
similarity index 100%
rename from src/bin_client/test/contracts/set_cdr.tz
rename to src/bin_client/test/contracts_opcode/set_cdr.tz
diff --git a/src/bin_client/test/contracts/set_id.tz b/src/bin_client/test/contracts_opcode/set_id.tz
similarity index 100%
rename from src/bin_client/test/contracts/set_id.tz
rename to src/bin_client/test/contracts_opcode/set_id.tz
diff --git a/src/bin_client/test/contracts/set_iter.tz b/src/bin_client/test/contracts_opcode/set_iter.tz
similarity index 100%
rename from src/bin_client/test/contracts/set_iter.tz
rename to src/bin_client/test/contracts_opcode/set_iter.tz
diff --git a/src/bin_client/test/contracts/set_member.tz b/src/bin_client/test/contracts_opcode/set_member.tz
similarity index 100%
rename from src/bin_client/test/contracts/set_member.tz
rename to src/bin_client/test/contracts_opcode/set_member.tz
diff --git a/src/bin_client/test/contracts/set_size.tz b/src/bin_client/test/contracts_opcode/set_size.tz
similarity index 100%
rename from src/bin_client/test/contracts/set_size.tz
rename to src/bin_client/test/contracts_opcode/set_size.tz
diff --git a/src/bin_client/test/contracts/slices.tz b/src/bin_client/test/contracts_opcode/slices.tz
similarity index 100%
rename from src/bin_client/test/contracts/slices.tz
rename to src/bin_client/test/contracts_opcode/slices.tz
diff --git a/src/bin_client/test/contracts/split_bytes.tz b/src/bin_client/test/contracts_opcode/split_bytes.tz
similarity index 100%
rename from src/bin_client/test/contracts/split_bytes.tz
rename to src/bin_client/test/contracts_opcode/split_bytes.tz
diff --git a/src/bin_client/test/contracts/split_string.tz b/src/bin_client/test/contracts_opcode/split_string.tz
similarity index 100%
rename from src/bin_client/test/contracts/split_string.tz
rename to src/bin_client/test/contracts_opcode/split_string.tz
diff --git a/src/bin_client/test/contracts/steps_to_quota.tz b/src/bin_client/test/contracts_opcode/steps_to_quota.tz
similarity index 100%
rename from src/bin_client/test/contracts/steps_to_quota.tz
rename to src/bin_client/test/contracts_opcode/steps_to_quota.tz
diff --git a/src/bin_client/test/contracts/store_input.tz b/src/bin_client/test/contracts_opcode/store_input.tz
similarity index 100%
rename from src/bin_client/test/contracts/store_input.tz
rename to src/bin_client/test/contracts_opcode/store_input.tz
diff --git a/src/bin_client/test/contracts/store_now.tz b/src/bin_client/test/contracts_opcode/store_now.tz
similarity index 100%
rename from src/bin_client/test/contracts/store_now.tz
rename to src/bin_client/test/contracts_opcode/store_now.tz
diff --git a/src/bin_client/test/contracts/str_id.tz b/src/bin_client/test/contracts_opcode/str_id.tz
similarity index 100%
rename from src/bin_client/test/contracts/str_id.tz
rename to src/bin_client/test/contracts_opcode/str_id.tz
diff --git a/src/bin_client/test/contracts/sub_timestamp_delta.tz b/src/bin_client/test/contracts_opcode/sub_timestamp_delta.tz
similarity index 100%
rename from src/bin_client/test/contracts/sub_timestamp_delta.tz
rename to src/bin_client/test/contracts_opcode/sub_timestamp_delta.tz
diff --git a/src/bin_client/test/contracts/subset.tz b/src/bin_client/test/contracts_opcode/subset.tz
similarity index 100%
rename from src/bin_client/test/contracts/subset.tz
rename to src/bin_client/test/contracts_opcode/subset.tz
diff --git a/src/bin_client/test/contracts/transfer_amount.tz b/src/bin_client/test/contracts_opcode/transfer_amount.tz
similarity index 100%
rename from src/bin_client/test/contracts/transfer_amount.tz
rename to src/bin_client/test/contracts_opcode/transfer_amount.tz
diff --git a/src/bin_client/test/contracts/transfer_to.tz b/src/bin_client/test/contracts_opcode/transfer_tokens.tz
similarity index 100%
rename from src/bin_client/test/contracts/transfer_to.tz
rename to src/bin_client/test/contracts_opcode/transfer_tokens.tz
diff --git a/src/bin_client/test/contracts/xor.tz b/src/bin_client/test/contracts_opcode/xor.tz
similarity index 100%
rename from src/bin_client/test/contracts/xor.tz
rename to src/bin_client/test/contracts_opcode/xor.tz
diff --git a/src/bin_client/test/test_basic.sh b/src/bin_client/test/test_basic.sh
index b507aa8f2..d548c66bd 100755
--- a/src/bin_client/test/test_basic.sh
+++ b/src/bin_client/test/test_basic.sh
@@ -59,11 +59,11 @@ $client get balance for $key2 | assert "2000 ꜩ"
 
 bake
 
-$client remember script noop file:contracts/noop.tz
-$client typecheck script file:contracts/noop.tz
+$client remember script noop file:contracts_opcode/noop.tz
+$client typecheck script file:contracts_opcode/noop.tz
 bake_after $client originate contract noop \
         for $key1 transferring 1,000 from bootstrap1 \
-        running file:contracts/noop.tz
+        running file:contracts_opcode/noop.tz
 
 bake_after $client transfer 10 from bootstrap1 to noop -arg "Unit"
 
diff --git a/src/bin_client/test/test_contracts.sh b/src/bin_client/test/test_contracts.sh
index cbe975beb..5840483a3 100755
--- a/src/bin_client/test/test_contracts.sh
+++ b/src/bin_client/test/test_contracts.sh
@@ -30,42 +30,6 @@ if [ ! $NO_TYPECHECK ] ; then
     printf "All contracts are well typed\n\n"
 fi
 
-# FORMAT: assert_output contract_file storage input expected_result
-
-assert_storage $contract_dir/ret_int.tz None Unit '(Some 300)'
-
-# Identity on strings
-assert_storage $contract_dir/str_id.tz None '"Hello"' '(Some "Hello")'
-assert_storage $contract_dir/str_id.tz None '"abcd"' '(Some "abcd")'
-
-# Identity on pairs
-assert_storage $contract_dir/pair_id.tz None '(Pair True False)' '(Some (Pair True False))'
-assert_storage $contract_dir/pair_id.tz None '(Pair False True)' '(Some (Pair False True))'
-assert_storage $contract_dir/pair_id.tz None '(Pair True True)' '(Some (Pair True True))'
-assert_storage $contract_dir/pair_id.tz None '(Pair False False)' '(Some (Pair False False))'
-
-# Logical not
-assert_storage $contract_dir/not.tz None True '(Some False)'
-assert_storage $contract_dir/not.tz None False '(Some True)'
-
-# Logical and
-#assert_storage $contract_dir/and.tz None "(Pair False False)" '(Some False)'
-#assert_storage $contract_dir/and.tz None "(Pair False True)" '(Some False)'
-#assert_storage $contract_dir/and.tz None "(Pair True False)" '(Some False)'
-#assert_storage $contract_dir/and.tz None "(Pair True True)" '(Some True)'
-
-# Logical or
-assert_storage $contract_dir/or.tz None "(Pair False False)" '(Some False)'
-assert_storage $contract_dir/or.tz None "(Pair False True)" '(Some True)'
-assert_storage $contract_dir/or.tz None "(Pair True False)" '(Some True)'
-assert_storage $contract_dir/or.tz None "(Pair True True)" '(Some True)'
-
-# XOR
-assert_storage $contract_dir/xor.tz None "(Pair False False)" '(Some False)'
-assert_storage $contract_dir/xor.tz None "(Pair False True)" '(Some True)'
-assert_storage $contract_dir/xor.tz None "(Pair True False)" '(Some True)'
-assert_storage $contract_dir/xor.tz None "(Pair True True)" '(Some False)'
-
 
 # Build list
 #assert_storage $contract_dir/build_list.tz '{}' 0 "{ 0 }"
@@ -90,128 +54,6 @@ assert_storage $contract_dir/max_in_list.tz None \
 assert_storage $contract_dir/max_in_list.tz None \
 			  '{ -10 ; -1 ; -20 ; -100 }' '(Some -1)'
 
-# Identity on lists
-assert_storage $contract_dir/list_id.tz '{""}' '{ "1" ; "2" ; "3" }' '{ "1" ; "2" ; "3" }'
-assert_storage $contract_dir/list_id.tz '{""}' '{}' '{}'
-assert_storage $contract_dir/list_id.tz '{""}' '{ "a" ; "b" ; "c" }' '{ "a" ; "b" ; "c" }'
-
-assert_storage $contract_dir/list_id_map.tz '{""}' '{ "1" ; "2" ; "3" }' '{ "1" ; "2" ; "3" }'
-assert_storage $contract_dir/list_id_map.tz '{""}' '{}' '{}'
-assert_storage $contract_dir/list_id_map.tz '{""}' '{ "a" ; "b" ; "c" }' '{ "a" ; "b" ; "c" }'
-
-
-# Identity on maps
-assert_storage $contract_dir/map_id.tz '{}' '{ Elt 0 1 }' '{ Elt 0 1 }'
-assert_storage $contract_dir/map_id.tz '{}' '{ Elt 0 0 }' '{ Elt 0 0 }'
-assert_storage $contract_dir/map_id.tz '{}' '{ Elt 0 0 ; Elt 3 4 }' '{ Elt 0 0 ; Elt 3 4 }'
-
-
-# List iter
-assert_storage $contract_dir/list_iter.tz 0 '{ 10 ; 2 ; 1 }' 20
-assert_storage $contract_dir/list_iter.tz 0 '{ 3 ; 6 ; 9 }' 162
-
-assert_storage $contract_dir/list_iter2.tz '"abc"' '{ "d" ; "e" ; "f" }' '"abcdef"'
-assert_storage $contract_dir/list_iter2.tz '"abc"' '{}' '"abc"'
-
-assert_storage $contract_dir/list_iter2_bytes.tz '0x00ab' '{ 0xcd ; 0xef ; 0x00 }' '0x00abcdef00'
-assert_storage $contract_dir/list_iter2_bytes.tz '0x' '{ 0x00 ; 0x11 ; 0x00 }' '0x001100'
-assert_storage $contract_dir/list_iter2_bytes.tz '0xabcd' '{}' '0xabcd'
-assert_storage $contract_dir/list_iter2_bytes.tz '0x' '{}' '0x'
-
-# Identity on sets
-assert_storage $contract_dir/set_id.tz '{}' '{ "a" ; "b" ; "c" }' '{ "a" ; "b" ; "c" }'
-assert_storage $contract_dir/set_id.tz '{}' '{}' '{}'
-assert_storage $contract_dir/set_id.tz '{}' '{ "asdf" ; "bcde" }' '{ "asdf" ; "bcde" }'
-
-# Set member -- set is in storage
-assert_storage $contract_dir/set_member.tz '(Pair {} None)' '"Hi"' '(Pair {} (Some False))'
-assert_storage $contract_dir/set_member.tz '(Pair { "Hi" } None)' '"Hi"' '(Pair { "Hi" } (Some True))'
-assert_storage $contract_dir/set_member.tz '(Pair { "Hello" ; "World" } None)' '""' '(Pair { "Hello" ; "World" } (Some False))'
-
-# Set size
-assert_storage $contract_dir/set_size.tz 111 '{}' 0
-assert_storage $contract_dir/set_size.tz 111 '{ 1 }' 1
-assert_storage $contract_dir/set_size.tz 111 '{ 1 ; 2 ; 3 }' 3
-assert_storage $contract_dir/set_size.tz 111 '{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }' 6
-
-# Set iter
-assert_storage $contract_dir/set_iter.tz 111 '{}' 0
-assert_storage $contract_dir/set_iter.tz 111 '{ 1 }' 1
-assert_storage $contract_dir/set_iter.tz 111 '{ -100 ; 1 ; 2 ; 3 }' '-94'
-
-# Map size
-assert_storage $contract_dir/map_size.tz 111 '{}' 0
-assert_storage $contract_dir/map_size.tz 111 '{ Elt "a" 1 }' 1
-assert_storage $contract_dir/map_size.tz 111 \
-              '{ Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 }' 3
-assert_storage $contract_dir/map_size.tz 111 \
-              '{ Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 }' 6
-
-# Contains all elements -- does the second list contain all of the same elements
-# as the first one? I'm ignoring element multiplicity
-#assert_storage $contract_dir/contains_all.tz \
-#			  None '(Pair {} {})' '(Some True)'
-#assert_storage $contract_dir/contains_all.tz \
-#			  None '(Pair { "a" } { "B" })' '(Some False)'
-#assert_storage $contract_dir/contains_all.tz \
-#			  None '(Pair { "A" } { "B" })' '(Some False)'
-#assert_storage $contract_dir/contains_all.tz \
-#			  None '(Pair { "B" } { "B" })' '(Some True)'
-#assert_storage $contract_dir/contains_all.tz None \
-#			  '(Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" })' '(Some True)'
-#assert_storage $contract_dir/contains_all.tz None \
-#			  '(Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" })' '(Some True)'
-
-# Concatenate the string in storage with all strings in the given list
-#assert_storage $contract_dir/concat_hello.tz '{}' \
-#			  '{ "World!" }' '{ "Hello World!" }'
-#assert_storage $contract_dir/concat_hello.tz '{}' \
-#			  '{}' '{}'
-#assert_storage $contract_dir/concat_hello.tz '{}' \
-#			  '{ "test1" ; "test2" }' '{ "Hello test1" ; "Hello test2" }'
-
-# Create an empty map and add a string to it
-#assert_storage $contract_dir/empty_map.tz '{}' Unit \
-#			  '{ Elt "hello" "world" }'
-
-# Get the value stored at the given key in the map
-#assert_storage $contract_dir/get_map_value.tz '(Pair None { Elt "hello" "hi" })' \
-#			  '"hello"' '(Pair (Some "hi") { Elt "hello" "hi" })'
-#assert_storage $contract_dir/get_map_value.tz '(Pair None { Elt "hello" "hi" })' \
-#			  '""' '(Pair None { Elt "hello" "hi" })'
-#assert_storage $contract_dir/get_map_value.tz \
-#			  '(Pair None { Elt "1" "one" ; Elt "2" "two" })' \
-#			  '"1"' '(Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" })'
-
-# Map iter
-assert_storage $contract_dir/map_iter.tz '(Pair 0 0)' '{ Elt 0 100 ; Elt 2 100 }' '(Pair 2 200)'
-assert_storage $contract_dir/map_iter.tz '(Pair 0 0)' '{ Elt 1 1 ; Elt 2 100 }' '(Pair 3 101)'
-
-# Return True if True branch of if was taken and False otherwise
-#assert_storage $contract_dir/if.tz None True '(Some True)'
-#assert_storage $contract_dir/if.tz None False '(Some False)'
-
-# Generate a pair of or types
-assert_storage $contract_dir/swap_left_right.tz '(Left "X")' '(Left True)' '(Right True)'
-assert_storage $contract_dir/swap_left_right.tz '(Left "X")' '(Right "a")' '(Left "a")'
-
-# Reverse a list
-assert_storage $contract_dir/reverse_loop.tz '{""}' '{}' '{}'
-assert_storage $contract_dir/reverse_loop.tz '{""}' '{ "c" ; "b" ; "a" }' '{ "a" ; "b" ; "c" }'
-
-# Exec concat contract
-#assert_storage $contract_dir/exec_concat.tz '"?"' '""' '"_abc"'
-#assert_storage $contract_dir/exec_concat.tz '"?"' '"test"' '"test_abc"'
-
-# Test PACK/UNPACK and binary format
-assert_success $client run script $contract_dir/packunpack.tz on storage Unit and input \
-               '(Pair (Pair (Pair "toto" {3;7;9;1}) {1;2;3}) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003)'
-
-assert_fails $client run script $contract_dir/packunpack.tz on storage Unit and input \
-               '(Pair (Pair (Pair "toto" {3;7;9;1}) {1;2;3}) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004)'
-
-# Get current steps to quota
-assert_storage $contract_dir/steps_to_quota.tz 111 Unit 399813
 
 # Typing gas bounds checks
 assert_fails $client originate contract first_explosion for bootstrap1 \
@@ -226,27 +68,11 @@ assert_fails $client run script  '{parameter (list int);storage (list (list (lis
                on storage '{}' \
                and input '{1;2;3;4;5;6;7;8;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1}'
 
-# Get the current balance of the contract
-#assert_storage $contract_dir/balance.tz '111' Unit '4000000000000'
-
 # Test comparisons on tez { EQ ; GT ; LT ; GE ; LE }
 #assert_storage $contract_dir/compare.tz '{}' '(Pair 1000000 2000000)' '{ False ; False ; True ; False ; True }'
 #assert_storage $contract_dir/compare.tz '{}' '(Pair 2000000 1000000)' '{ False ; True ; False ; True ; False }'
 #assert_storage $contract_dir/compare.tz '{}' '(Pair 2370000 2370000)' '{ True ; False ; False ; True ; True }'
 
-# Test addition and subtraction on tez
-#assert_storage $contract_dir/tez_add_sub.tz None '(Pair 2000000 1000000)' '(Some (Pair 3000000 1000000))'
-#assert_storage $contract_dir/tez_add_sub.tz None '(Pair 2310000 1010000)' '(Some (Pair 3320000 1300000))'
-
-# Test get first element of list
-#assert_storage $contract_dir/first.tz '111' '{ 1 ; 2 ; 3 ; 4 }' '1'
-#assert_storage $contract_dir/first.tz '111' '{ 4 }' '4'
-
-# Hash input string
-# Test assumed to be correct -- hash is based on encoding of AST
-#assert_storage $contract_dir/hash_string.tz '0x00' '"abcdefg"' '0x46fdbcb4ea4eadad5615cdaa17d67f783e01e21149ce2b27de497600b4cd8f4e'
-#assert_storage $contract_dir/hash_string.tz '0x00' '"12345"' '0xb4c26c20de52a4eaf0d8a340db47ad8cb1e74049570859c9a9a3952b204c772f'
-
 # Test ASSERT
 #assert_storage $contract_dir/assert.tz Unit True Unit
 #assert_fails $client run script $contract_dir/assert.tz on storage Unit and input False
@@ -303,20 +129,7 @@ assert_fails $client run script  '{parameter (list int);storage (list (list (lis
 #assert_storage $contract_dir/assert_cmpge.tz Unit '(Pair 0 -1)' Unit
 #assert_fails $client run script $contract_dir/assert_cmpge.tz on storage Unit and input '(Pair -1 0)'
 
-# IF_SOME
-#assert_storage $contract_dir/if_some.tz '"?"' '(Some "hello")' '"hello"'
-#assert_storage $contract_dir/if_some.tz '"?"' 'None' '""'
-
-# Tests the SET_CAR and SET_CDR instructions
-assert_storage  $contract_dir/set_car.tz '(Pair "hello" 0)' '"world"' '(Pair "world" 0)'
-assert_storage  $contract_dir/set_car.tz '(Pair "hello" 0)' '"abc"' '(Pair "abc" 0)'
-assert_storage  $contract_dir/set_car.tz '(Pair "hello" 0)' '""' '(Pair "" 0)'
-assert_fails $client run script $contract_dir/set_car.tz on storage '(Pair %wrong %field "hello" 0)' Unit and input '""'
-
-assert_storage  $contract_dir/set_cdr.tz '(Pair "hello" 0)' '1' '(Pair "hello" 1)'
-assert_storage  $contract_dir/set_cdr.tz '(Pair "hello" 500)' '3' '(Pair "hello" 3)'
-assert_storage  $contract_dir/set_cdr.tz '(Pair "hello" 7)' '100' '(Pair "hello" 100)'
-
+# Tests the SET_CAR and SET_CDR instructions (macros)
 assert_storage  $contract_dir/set_caddaadr.tz \
 '(Pair (Pair 1 (Pair 2 (Pair (Pair (Pair 3 0) 4) 5))) 6)' \
 '3000000' \
@@ -327,79 +140,6 @@ assert_storage  $contract_dir/map_caddaadr.tz \
 'Unit' \
 '(Pair (Pair 1 (Pair 2 (Pair (Pair (Pair 3 1000000) 4) 5))) 6)'
 
-# Did the given key sign the string? (key is bootstrap1)
-#assert_success $client run script $contract_dir/check_signature.tz \
-#               on storage '(Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" "hello")' \
-#               and input '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"'
-
-#assert_fails $client run script $contract_dir/check_signature.tz \
-#             on storage '(Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" "abcd")' \
-#             and input '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"'
-
-
-# Convert a public key to a public key hash
-#assert_storage $contract_dir/hash_key.tz None '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"' \
-#               '(Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")'
-#assert_storage $contract_dir/hash_key.tz None '"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES"' \
-#               '(Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k")'
-
-
-#bake_after $client transfer 1,000 from bootstrap1 to $key1
-#bake_after $client transfer 2,000 from bootstrap1 to $key2
-
-#assert_balance $key1 "1000 ꜩ"
-#assert_balance $key2 "2000 ꜩ"
-
-# Create a contract and transfer 100 ꜩ to it
-init_with_transfer $contract_dir/store_input.tz $key1 '""' 100 bootstrap1
-bake_after $client transfer 100 from bootstrap1 to store_input -arg '"abcdefg"'
-assert_balance store_input "200 ꜩ"
-assert_storage_contains store_input '"abcdefg"'
-bake_after $client transfer 100 from bootstrap1 to store_input -arg '"xyz"'
-assert_storage_contains store_input '"xyz"'
-
-init_with_transfer $contract_dir/transfer_amount.tz $key1 '0' "100" bootstrap1
-bake_after $client transfer 500 from bootstrap1 to transfer_amount -arg Unit
-assert_storage_contains transfer_amount 500
-
-# This tests the `NOW` instruction.
-# This test may fail if timings are marginal, though I have not yet seen this happen
-init_with_transfer $contract_dir/store_now.tz $key1 '"2017-07-13T09:19:01Z"' "100" bootstrap1
-bake_after $client transfer 500 from bootstrap1 to store_now -arg Unit
-assert_storage_contains store_now "$($client get timestamp)"
-
-# Test timestamp operations
-#assert_storage $contract_dir/add_timestamp_delta.tz None '(Pair 100 100)' '(Some "1970-01-01T00:03:20Z")'
-#assert_storage $contract_dir/add_timestamp_delta.tz None '(Pair 100 -100)' '(Some "1970-01-01T00:00:00Z")'
-#assert_storage $contract_dir/add_timestamp_delta.tz None '(Pair "1970-01-01T00:00:00Z" 0)' '(Some "1970-01-01T00:00:00Z")'
-
-#assert_storage $contract_dir/add_delta_timestamp.tz None '(Pair 100 100)' '(Some "1970-01-01T00:03:20Z")'
-#assert_storage $contract_dir/add_delta_timestamp.tz None '(Pair -100 100)' '(Some "1970-01-01T00:00:00Z")'
-#assert_storage $contract_dir/add_delta_timestamp.tz None '(Pair 0 "1970-01-01T00:00:00Z")' '(Some "1970-01-01T00:00:00Z")'
-
-assert_storage $contract_dir/sub_timestamp_delta.tz 111 '(Pair 100 100)' '"1970-01-01T00:00:00Z"'
-assert_storage $contract_dir/sub_timestamp_delta.tz 111 '(Pair 100 -100)' '"1970-01-01T00:03:20Z"'
-assert_storage $contract_dir/sub_timestamp_delta.tz 111 '(Pair 100 2000000000000000000)' -1999999999999999900
-
-#assert_storage $contract_dir/diff_timestamps.tz 111 '(Pair 0 0)' 0
-#assert_storage $contract_dir/diff_timestamps.tz 111 '(Pair 0 1)' -1
-#assert_storage $contract_dir/diff_timestamps.tz 111 '(Pair 1 0)' 1
-#assert_storage $contract_dir/diff_timestamps.tz 111 '(Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z")' 200
-
-
-# Tests TRANSFER_TO
-bake_after $client originate account "test_transfer_account1" for $key1 transferring 100 from bootstrap1
-bake_after $client originate account "test_transfer_account2" for $key1 transferring 20 from bootstrap1
-init_with_transfer $contract_dir/transfer_to.tz $key2 Unit 1,000 bootstrap1
-assert_balance test_transfer_account1 "100 ꜩ"
-bake_after $client transfer 100 from bootstrap1 to transfer_to \
-           -arg "\"$(get_contract_addr test_transfer_account1)\""
-assert_balance test_transfer_account1 "200 ꜩ" # Why isn't this 200 ꜩ? Baking fee?
-bake_after $client transfer 100 from bootstrap1 to transfer_to \
-            -arg "\"$(get_contract_addr test_transfer_account2)\""
-assert_balance test_transfer_account2 "120 ꜩ" # Why isn't this 120 ꜩ? Baking fee?
-
-
 # Test replay prevention
 init_with_transfer $contract_dir/replay.tz $key2 Unit 0 bootstrap1
 assert_fails $client transfer 0 from bootstrap1 to replay
@@ -438,12 +178,6 @@ assert_fails $client transfer 0 from bootstrap1 to replay
 #bake_after $client transfer 0 from bootstrap1 to default_account  -arg "\"$account\""
 #assert_balance $account "100 ꜩ"
 
-# Test SELF
-init_with_transfer $contract_dir/self.tz $key1 \
-				   '"tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx"' 1,000 bootstrap1
-bake_after $client transfer 0 from bootstrap1 to self
-assert_storage_contains self "\"$(get_contract_addr self)\""
-
 # Test bytes, SHA256, CHECK_SIGNATURE
 init_with_transfer $contract_dir/reveal_signed_preimage.tz bootstrap1 \
 				   '(Pair 0x9995c2ef7bcc7ae3bd15bdd9b02dc6e877c27b26732340d641a4cbc6524813bb "p2pk66uq221795tFxT7jfNmXtBMdjMf6RAaxRTwv1dbuSHbH6yfqGwz")' 1,000 bootstrap1
@@ -461,37 +195,6 @@ bake
 #assert_storage $contract_dir/compare_bytes.tz '{}' '(Pair 0x33 0x33)' '{ True ; False ; False ; True ; True }'
 #assert_storage $contract_dir/compare_bytes.tz '{}' '(Pair 0x34 0x33)' '{ False ; True ; False ; True ; False }'
 
-# Test SLICE and SIZE on bytes
-init_with_transfer $contract_dir/slices.tz bootstrap1 \
-				   '"sppk7dBPqMPjDjXgKbb5f7V3PuKUrA4Zuwc3c3H7XqQerqPUWbK7Hna"' 1,000 bootstrap1
-
-assert_fails $client transfer 0 from bootstrap1 to slices -arg \
-        '(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "p2sigsceCzcDw2AeYDzUonj4JT341WC9Px4wdhHBxbZcG1FhfqFVuG7f2fGCzrEHSAZgrsrQWpxduDPk9qZRgrpzwJnSHC3gZJ")'
-assert_fails $client transfer 0 from bootstrap1 to slices -arg \
-        '(Pair 0xeaa9ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")'
-assert_fails $client transfer 0 from bootstrap1 to slices -arg \
-        '(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2deaad01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")'
-assert_fails $client transfer 0 from bootstrap1 to slices -arg \
-        '(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150733eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")'
-assert_fails $client transfer 0 from bootstrap1 to slices -arg \
-        '(Pair 0xe009ab79e8b84ef0 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")'
-assert_success $client transfer 0 from bootstrap1 to slices -arg \
-        '(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")'
-bake
-
-init_with_transfer $contract_dir/split_string.tz bootstrap1 '{}' 1,000 bootstrap1
-
-bake_after $client transfer 0 from bootstrap1 to split_string -arg '"abc"'
-assert_storage_contains split_string '{ "a" ; "b" ; "c" }'
-bake_after $client transfer 0 from bootstrap1 to split_string -arg '"def"'
-assert_storage_contains split_string '{ "a" ; "b" ; "c" ; "d" ; "e" ; "f" }'
-
-init_with_transfer $contract_dir/split_bytes.tz bootstrap1 '{}' 1,000 bootstrap1
-
-bake_after $client transfer 0 from bootstrap1 to split_bytes -arg '0xaabbcc'
-assert_storage_contains split_bytes '{ 0xaa ; 0xbb ; 0xcc }'
-bake_after $client transfer 0 from bootstrap1 to split_bytes -arg '0xddeeff'
-assert_storage_contains split_bytes '{ 0xaa ; 0xbb ; 0xcc ; 0xdd ; 0xee ; 0xff }'
 
 # Test SET_DELEGATE
 #b2='tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN'
diff --git a/src/bin_client/test/test_contracts_opcode.sh b/src/bin_client/test/test_contracts_opcode.sh
index a750681c3..4a1d58f6b 100644
--- a/src/bin_client/test/test_contracts_opcode.sh
+++ b/src/bin_client/test/test_contracts_opcode.sh
@@ -30,15 +30,24 @@ if [ ! $NO_TYPECHECK ] ; then
     printf "All contracts are well typed\n\n"
 fi
 
-# delta timestamp
-assert_storage $contract_op_dir/add_delta_timestamp.tz None '(Pair 100 100)' '(Some "1970-01-01T00:03:20Z")'
-assert_storage $contract_op_dir/add_delta_timestamp.tz None '(Pair -100 100)' '(Some "1970-01-01T00:00:00Z")'
-assert_storage $contract_op_dir/add_delta_timestamp.tz None '(Pair 0 "1970-01-01T00:00:00Z")' '(Some "1970-01-01T00:00:00Z")'
+# FORMAT: assert_output contract_file storage input expected_result
 
-# Test timestamp operations
-assert_storage $contract_op_dir/add_timestamp_delta.tz None '(Pair 100 100)' '(Some "1970-01-01T00:03:20Z")'
-assert_storage $contract_op_dir/add_timestamp_delta.tz None '(Pair 100 -100)' '(Some "1970-01-01T00:00:00Z")'
-assert_storage $contract_op_dir/add_timestamp_delta.tz None '(Pair "1970-01-01T00:00:00Z" 0)' '(Some "1970-01-01T00:00:00Z")'
+assert_storage $contract_op_dir/ret_int.tz None Unit '(Some 300)'
+
+
+# Identity on strings
+assert_storage $contract_op_dir/str_id.tz None '"Hello"' '(Some "Hello")'
+assert_storage $contract_op_dir/str_id.tz None '"abcd"' '(Some "abcd")'
+
+# Identity on pairs
+assert_storage $contract_op_dir/pair_id.tz None '(Pair True False)' '(Some (Pair True False))'
+assert_storage $contract_op_dir/pair_id.tz None '(Pair False True)' '(Some (Pair False True))'
+assert_storage $contract_op_dir/pair_id.tz None '(Pair True True)' '(Some (Pair True True))'
+assert_storage $contract_op_dir/pair_id.tz None '(Pair False False)' '(Some (Pair False False))'
+
+# Logical not
+assert_storage $contract_op_dir/not.tz None True '(Some False)'
+assert_storage $contract_op_dir/not.tz None False '(Some True)'
 
 # Logical and
 assert_storage $contract_op_dir/and.tz None "(Pair False False)" '(Some False)'
@@ -46,67 +55,109 @@ assert_storage $contract_op_dir/and.tz None "(Pair False True)" '(Some False)'
 assert_storage $contract_op_dir/and.tz None "(Pair True False)" '(Some False)'
 assert_storage $contract_op_dir/and.tz None "(Pair True True)" '(Some True)'
 
-# Get the current balance of the contract
-assert_storage $contract_op_dir/balance.tz '111' Unit '4000000000000'
+# Logical or
+assert_storage $contract_op_dir/or.tz None "(Pair False False)" '(Some False)'
+assert_storage $contract_op_dir/or.tz None "(Pair False True)" '(Some True)'
+assert_storage $contract_op_dir/or.tz None "(Pair True False)" '(Some True)'
+assert_storage $contract_op_dir/or.tz None "(Pair True True)" '(Some True)'
 
-# Did the given key sign the string? (key is bootstrap1)
+# XOR
+assert_storage $contract_op_dir/xor.tz None "(Pair False False)" '(Some False)'
+assert_storage $contract_op_dir/xor.tz None "(Pair False True)" '(Some True)'
+assert_storage $contract_op_dir/xor.tz None "(Pair True False)" '(Some True)'
+assert_storage $contract_op_dir/xor.tz None "(Pair True True)" '(Some False)'
 
-assert_success $client run script $contract_op_dir/check_signature.tz \
-               on storage '(Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" "hello")' \
-               and input '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"'
-
-assert_fails $client run script $contract_op_dir/check_signature.tz \
-             on storage '(Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" "abcd")' \
-             and input '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"'
-
-
-# Concatenate the string in storage with all strings in the given list
-assert_storage $contract_op_dir/concat_hello.tz '{}' \
-     			  '{ "World!" }' '{ "Hello World!" }'
-assert_storage $contract_op_dir/concat_hello.tz '{}' \
-     			  '{}' '{}'
-assert_storage $contract_op_dir/concat_hello.tz '{}' \
-     			  '{ "test1" ; "test2" }' '{ "Hello test1" ; "Hello test2" }'
 
 # Concatenate all strings of a list into one string
 assert_storage $contract_op_dir/concat_list.tz '""' '{ "a" ; "b" ; "c" }' '"abc"'
 assert_storage $contract_op_dir/concat_list.tz '""' '{}' '""'
 assert_storage $contract_op_dir/concat_list.tz \
-     			  '""' '{ "Hello" ; " " ; "World" ; "!" }' '"Hello World!"'
+			  '""' '{ "Hello" ; " " ; "World" ; "!" }' '"Hello World!"'
+
+# Identity on lists
+assert_storage $contract_op_dir/list_id.tz '{""}' '{ "1" ; "2" ; "3" }' '{ "1" ; "2" ; "3" }'
+assert_storage $contract_op_dir/list_id.tz '{""}' '{}' '{}'
+assert_storage $contract_op_dir/list_id.tz '{""}' '{ "a" ; "b" ; "c" }' '{ "a" ; "b" ; "c" }'
+
+assert_storage $contract_op_dir/list_id_map.tz '{""}' '{ "1" ; "2" ; "3" }' '{ "1" ; "2" ; "3" }'
+assert_storage $contract_op_dir/list_id_map.tz '{""}' '{}' '{}'
+assert_storage $contract_op_dir/list_id_map.tz '{""}' '{ "a" ; "b" ; "c" }' '{ "a" ; "b" ; "c" }'
+
+
+# Identity on maps
+assert_storage $contract_op_dir/map_id.tz '{}' '{ Elt 0 1 }' '{ Elt 0 1 }'
+assert_storage $contract_op_dir/map_id.tz '{}' '{ Elt 0 0 }' '{ Elt 0 0 }'
+assert_storage $contract_op_dir/map_id.tz '{}' '{ Elt 0 0 ; Elt 3 4 }' '{ Elt 0 0 ; Elt 3 4 }'
+
+# Identity on sets
+assert_storage $contract_op_dir/set_id.tz '{}' '{ "a" ; "b" ; "c" }' '{ "a" ; "b" ; "c" }'
+assert_storage $contract_op_dir/set_id.tz '{}' '{}' '{}'
+assert_storage $contract_op_dir/set_id.tz '{}' '{ "asdf" ; "bcde" }' '{ "asdf" ; "bcde" }'
+
+# List concat
+assert_storage $contract_op_dir/list_concat.tz '"abc"' '{ "d" ; "e" ; "f" }' '"abcdef"'
+assert_storage $contract_op_dir/list_concat.tz '"abc"' '{}' '"abc"'
+
+assert_storage $contract_op_dir/list_concat_bytes.tz '0x00ab' '{ 0xcd ; 0xef ; 0x00 }' '0x00abcdef00'
+assert_storage $contract_op_dir/list_concat_bytes.tz '0x' '{ 0x00 ; 0x11 ; 0x00 }' '0x001100'
+assert_storage $contract_op_dir/list_concat_bytes.tz '0xabcd' '{}' '0xabcd'
+assert_storage $contract_op_dir/list_concat_bytes.tz '0x' '{}' '0x'
+
+# List iter
+assert_storage $contract_op_dir/list_iter.tz 0 '{ 10 ; 2 ; 1 }' 20
+assert_storage $contract_op_dir/list_iter.tz 0 '{ 3 ; 6 ; 9 }' 162
+
+# Set member -- set is in storage
+assert_storage $contract_op_dir/set_member.tz '(Pair {} None)' '"Hi"' '(Pair {} (Some False))'
+assert_storage $contract_op_dir/set_member.tz '(Pair { "Hi" } None)' '"Hi"' '(Pair { "Hi" } (Some True))'
+assert_storage $contract_op_dir/set_member.tz '(Pair { "Hello" ; "World" } None)' '""' '(Pair { "Hello" ; "World" } (Some False))'
+
+# Set size
+assert_storage $contract_op_dir/set_size.tz 111 '{}' 0
+assert_storage $contract_op_dir/set_size.tz 111 '{ 1 }' 1
+assert_storage $contract_op_dir/set_size.tz 111 '{ 1 ; 2 ; 3 }' 3
+assert_storage $contract_op_dir/set_size.tz 111 '{ 1 ; 2 ; 3 ; 4 ; 5 ; 6 }' 6
+
+# Set iter
+assert_storage $contract_op_dir/set_iter.tz 111 '{}' 0
+assert_storage $contract_op_dir/set_iter.tz 111 '{ 1 }' 1
+assert_storage $contract_op_dir/set_iter.tz 111 '{ -100 ; 1 ; 2 ; 3 }' '-94'
+
+# Map size
+assert_storage $contract_op_dir/map_size.tz 111 '{}' 0
+assert_storage $contract_op_dir/map_size.tz 111 '{ Elt "a" 1 }' 1
+assert_storage $contract_op_dir/map_size.tz 111 \
+              '{ Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 }' 3
+assert_storage $contract_op_dir/map_size.tz 111 \
+              '{ Elt "a" 1 ; Elt "b" 2 ; Elt "c" 3 ; Elt "d" 4 ; Elt "e" 5 ; Elt "f" 6 }' 6
 
 # Contains all elements -- does the second list contain all of the same elements
 # as the first one? I'm ignoring element multiplicity
 assert_storage $contract_op_dir/contains_all.tz \
-   			  None '(Pair {} {})' '(Some True)'
+			  None '(Pair {} {})' '(Some True)'
 assert_storage $contract_op_dir/contains_all.tz \
-   			  None '(Pair { "a" } { "B" })' '(Some False)'
+			  None '(Pair { "a" } { "B" })' '(Some False)'
 assert_storage $contract_op_dir/contains_all.tz \
-     		  None '(Pair { "A" } { "B" })' '(Some False)'
+			  None '(Pair { "A" } { "B" })' '(Some False)'
 assert_storage $contract_op_dir/contains_all.tz \
-  			  None '(Pair { "B" } { "B" })' '(Some True)'
+			  None '(Pair { "B" } { "B" })' '(Some True)'
 assert_storage $contract_op_dir/contains_all.tz None \
- 			  '(Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" })' '(Some True)'
+			  '(Pair { "B" ; "C" ; "asdf" } { "B" ; "B" ; "asdf" ; "C" })' '(Some True)'
 assert_storage $contract_op_dir/contains_all.tz None \
- 			  '(Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" })' '(Some True)'
+			  '(Pair { "B" ; "B" ; "asdf" ; "C" } { "B" ; "C" ; "asdf" })' '(Some True)'
 
-# different timestamp
-assert_storage $contract_op_dir/diff_timestamps.tz 111 '(Pair 0 0)' 0
-assert_storage $contract_op_dir/diff_timestamps.tz 111 '(Pair 0 1)' -1
-assert_storage $contract_op_dir/diff_timestamps.tz 111 '(Pair 1 0)' 1
-assert_storage $contract_op_dir/diff_timestamps.tz 111 '(Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z")' 200
+# Concatenate the string in storage with all strings in the given list
+assert_storage $contract_op_dir/concat_hello.tz '{}' \
+			  '{ "World!" }' '{ "Hello World!" }'
+assert_storage $contract_op_dir/concat_hello.tz '{}' \
+			  '{}' '{}'
+assert_storage $contract_op_dir/concat_hello.tz '{}' \
+			  '{ "test1" ; "test2" }' '{ "Hello test1" ; "Hello test2" }'
 
 # Create an empty map and add a string to it
 assert_storage $contract_op_dir/empty_map.tz '{}' Unit \
 			  '{ Elt "hello" "world" }'
 
-# Exec concat contract
-assert_storage $contract_op_dir/exec_concat.tz '"?"' '""' '"_abc"'
-assert_storage $contract_op_dir/exec_concat.tz '"?"' '"test"' '"test_abc"'
-
-# Test get first element of list
-assert_storage $contract_op_dir/first.tz '111' '{ 1 ; 2 ; 3 ; 4 }' '1'
-assert_storage $contract_op_dir/first.tz '111' '{ 4 }' '4'
-
 # Get the value stored at the given key in the map
 assert_storage $contract_op_dir/get_map_value.tz '(Pair None { Elt "hello" "hi" })' \
 			  '"hello"' '(Pair (Some "hi") { Elt "hello" "hi" })'
@@ -116,27 +167,46 @@ assert_storage $contract_op_dir/get_map_value.tz \
 			  '(Pair None { Elt "1" "one" ; Elt "2" "two" })' \
 			  '"1"' '(Pair (Some "one") { Elt "1" "one" ; Elt "2" "two" })'
 
-# Test hash consistency between Michelson and the CLI
-hash_result=`$client hash data '(Pair 22220000000 (Pair "2017-12-13T04:49:00Z" 034))' \
-           of type '(pair mutez (pair timestamp int))' | grep Blake2b | sed 's/.*: *//'`
+# Map iter
+assert_storage $contract_op_dir/map_iter.tz '(Pair 0 0)' '{ Elt 0 100 ; Elt 2 100 }' '(Pair 2 200)'
+assert_storage $contract_op_dir/map_iter.tz '(Pair 0 0)' '{ Elt 1 1 ; Elt 2 100 }' '(Pair 3 101)'
 
-assert_storage $contract_op_dir/hash_consistency_checker.tz '0x00' \
-          '(Pair 22220000000 (Pair "2017-12-13T04:49:00Z" 034))' "$hash_result"
+# Return True if True branch of if was taken and False otherwise
+assert_storage $contract_op_dir/if.tz None True '(Some True)'
+assert_storage $contract_op_dir/if.tz None False '(Some False)'
 
-assert_storage $contract_op_dir/hash_consistency_checker.tz '0x00' \
-          '(Pair 22220000000 (Pair "2017-12-13T04:49:00+00:00" 34))' "$hash_result"
+# Generate a pair of or types
+assert_storage $contract_op_dir/left_right.tz '(Left "X")' '(Left True)' '(Right True)'
+assert_storage $contract_op_dir/left_right.tz '(Left "X")' '(Right "a")' '(Left "a")'
 
-# Convert a public key to a public key hash
-assert_storage $contract_op_dir/hash_key.tz None '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"' \
-          '(Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")'
-assert_storage $contract_op_dir/hash_key.tz None '"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES"' \
-          '(Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k")'
+# Reverse a list
+assert_storage $contract_op_dir/reverse_loop.tz '{""}' '{}' '{}'
+assert_storage $contract_op_dir/reverse_loop.tz '{""}' '{ "c" ; "b" ; "a" }' '{ "a" ; "b" ; "c" }'
 
-bake_after $client transfer 1,000 from bootstrap1 to $key1
-bake_after $client transfer 2,000 from bootstrap1 to $key2
+# Exec concat contract
+assert_storage $contract_op_dir/exec_concat.tz '"?"' '""' '"_abc"'
+assert_storage $contract_op_dir/exec_concat.tz '"?"' '"test"' '"test_abc"'
 
-assert_balance $key1 "1000 ꜩ"
-assert_balance $key2 "2000 ꜩ"
+# Test PACK/UNPACK and binary format
+assert_success $client run script $contract_op_dir/packunpack.tz on storage Unit and input \
+               '(Pair (Pair (Pair "toto" {3;7;9;1}) {1;2;3}) 0x05070707070100000004746f746f020000000800030007000900010200000006000100020003)'
+
+assert_fails $client run script $contract_op_dir/packunpack.tz on storage Unit and input \
+               '(Pair (Pair (Pair "toto" {3;7;9;1}) {1;2;3}) 0x05070707070100000004746f746f0200000008000300070009000102000000060001000200030004)'
+
+# Get current steps to quota
+assert_storage $contract_op_dir/steps_to_quota.tz 111 Unit 399813
+
+# Get the current balance of the contract
+assert_storage $contract_op_dir/balance.tz '111' Unit '4000000000000'
+
+# Test addition and subtraction on tez
+assert_storage $contract_op_dir/tez_add_sub.tz None '(Pair 2000000 1000000)' '(Some (Pair 3000000 1000000))'
+assert_storage $contract_op_dir/tez_add_sub.tz None '(Pair 2310000 1010000)' '(Some (Pair 3320000 1300000))'
+
+# Test get first element of list
+assert_storage $contract_op_dir/first.tz '111' '{ 1 ; 2 ; 3 ; 4 }' '1'
+assert_storage $contract_op_dir/first.tz '111' '{ 4 }' '4'
 
 # Hash input string
 # Test assumed to be correct -- hash is based on encoding of AST
@@ -147,10 +217,136 @@ assert_storage $contract_op_dir/hash_string.tz '0x00' '"12345"' '0xb4c26c20de52a
 assert_storage $contract_op_dir/if_some.tz '"?"' '(Some "hello")' '"hello"'
 assert_storage $contract_op_dir/if_some.tz '"?"' 'None' '""'
 
-# Return True if True branch of if was taken and False otherwise
-assert_storage $contract_op_dir/if.tz None True '(Some True)'
-assert_storage $contract_op_dir/if.tz None False '(Some False)'
+# Tests the SET_CAR and SET_CDR instructions
+assert_storage  $contract_op_dir/set_car.tz '(Pair "hello" 0)' '"world"' '(Pair "world" 0)'
+assert_storage  $contract_op_dir/set_car.tz '(Pair "hello" 0)' '"abc"' '(Pair "abc" 0)'
+assert_storage  $contract_op_dir/set_car.tz '(Pair "hello" 0)' '""' '(Pair "" 0)'
+assert_fails $client run script $contract_op_dir/set_car.tz on storage '(Pair %wrong %field "hello" 0)' Unit and input '""'
 
-# Test addition and subtraction on tez
-assert_storage $contract_op_dir/tez_add_sub.tz None '(Pair 2000000 1000000)' '(Some (Pair 3000000 1000000))'
-assert_storage $contract_op_dir/tez_add_sub.tz None '(Pair 2310000 1010000)' '(Some (Pair 3320000 1300000))'
+assert_storage  $contract_op_dir/set_cdr.tz '(Pair "hello" 0)' '1' '(Pair "hello" 1)'
+assert_storage  $contract_op_dir/set_cdr.tz '(Pair "hello" 500)' '3' '(Pair "hello" 3)'
+assert_storage  $contract_op_dir/set_cdr.tz '(Pair "hello" 7)' '100' '(Pair "hello" 100)'
+
+# Did the given key sign the string? (key is bootstrap1)
+assert_success $client run script $contract_op_dir/check_signature.tz \
+               on storage '(Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" "hello")' \
+               and input '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"'
+
+assert_fails $client run script $contract_op_dir/check_signature.tz \
+             on storage '(Pair "edsigthTzJ8X7MPmNeEwybRAvdxS1pupqcM5Mk4uCuyZAe7uEk68YpuGDeViW8wSXMrCi5CwoNgqs8V2w8ayB5dMJzrYCHhD8C7" "abcd")' \
+             and input '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"'
+
+
+# Convert a public key to a public key hash
+assert_storage $contract_op_dir/hash_key.tz None '"edpkuBknW28nW72KG6RoHtYW7p12T6GKc7nAbwYX5m8Wd9sDVC9yav"' \
+               '(Some "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx")'
+assert_storage $contract_op_dir/hash_key.tz None '"edpkuJqtDcA2m2muMxViSM47MPsGQzmyjnNTawUPqR8vZTAMcx61ES"' \
+               '(Some "tz1XPTDmvT3vVE5Uunngmixm7gj7zmdbPq6k")'
+
+bake_after $client transfer 1,000 from bootstrap1 to $key1
+bake_after $client transfer 2,000 from bootstrap1 to $key2
+
+assert_balance $key1 "1000 ꜩ"
+assert_balance $key2 "2000 ꜩ"
+
+# Create a contract and transfer 100 ꜩ to it
+init_with_transfer $contract_op_dir/store_input.tz $key1 '""' 100 bootstrap1
+bake_after $client transfer 100 from bootstrap1 to store_input -arg '"abcdefg"'
+assert_balance store_input "200 ꜩ"
+assert_storage_contains store_input '"abcdefg"'
+bake_after $client transfer 100 from bootstrap1 to store_input -arg '"xyz"'
+assert_storage_contains store_input '"xyz"'
+
+init_with_transfer $contract_op_dir/transfer_amount.tz $key1 '0' "100" bootstrap1
+bake_after $client transfer 500 from bootstrap1 to transfer_amount -arg Unit
+assert_storage_contains transfer_amount 500
+
+
+# This tests the `NOW` instruction.
+# This test may fail if timings are marginal, though I have not yet seen this happen
+init_with_transfer $contract_op_dir/store_now.tz $key1 '"2017-07-13T09:19:01Z"' "100" bootstrap1
+bake_after $client transfer 500 from bootstrap1 to store_now -arg Unit
+assert_storage_contains store_now "$($client get timestamp)"
+
+# Test timestamp operations
+assert_storage $contract_op_dir/add_timestamp_delta.tz None '(Pair 100 100)' '(Some "1970-01-01T00:03:20Z")'
+assert_storage $contract_op_dir/add_timestamp_delta.tz None '(Pair 100 -100)' '(Some "1970-01-01T00:00:00Z")'
+assert_storage $contract_op_dir/add_timestamp_delta.tz None '(Pair "1970-01-01T00:00:00Z" 0)' '(Some "1970-01-01T00:00:00Z")'
+
+assert_storage $contract_op_dir/add_delta_timestamp.tz None '(Pair 100 100)' '(Some "1970-01-01T00:03:20Z")'
+assert_storage $contract_op_dir/add_delta_timestamp.tz None '(Pair -100 100)' '(Some "1970-01-01T00:00:00Z")'
+assert_storage $contract_op_dir/add_delta_timestamp.tz None '(Pair 0 "1970-01-01T00:00:00Z")' '(Some "1970-01-01T00:00:00Z")'
+
+assert_storage $contract_op_dir/sub_timestamp_delta.tz 111 '(Pair 100 100)' '"1970-01-01T00:00:00Z"'
+assert_storage $contract_op_dir/sub_timestamp_delta.tz 111 '(Pair 100 -100)' '"1970-01-01T00:03:20Z"'
+assert_storage $contract_op_dir/sub_timestamp_delta.tz 111 '(Pair 100 2000000000000000000)' -1999999999999999900
+
+assert_storage $contract_op_dir/diff_timestamps.tz 111 '(Pair 0 0)' 0
+assert_storage $contract_op_dir/diff_timestamps.tz 111 '(Pair 0 1)' -1
+assert_storage $contract_op_dir/diff_timestamps.tz 111 '(Pair 1 0)' 1
+assert_storage $contract_op_dir/diff_timestamps.tz 111 '(Pair "1970-01-01T00:03:20Z" "1970-01-01T00:00:00Z")' 200
+
+# Tests TRANSFER_TOKENS
+bake_after $client originate account "test_transfer_account1" for $key1 transferring 100 from bootstrap1
+bake_after $client originate account "test_transfer_account2" for $key1 transferring 20 from bootstrap1
+init_with_transfer $contract_op_dir/transfer_tokens.tz $key2 Unit 1,000 bootstrap1
+assert_balance test_transfer_account1 "100 ꜩ"
+bake_after $client transfer 100 from bootstrap1 to transfer_tokens \
+           -arg "\"$(get_contract_addr test_transfer_account1)\""
+assert_balance test_transfer_account1 "200 ꜩ" # Why isn't this 200 ꜩ? Baking fee?
+bake_after $client transfer 100 from bootstrap1 to transfer_tokens \
+            -arg "\"$(get_contract_addr test_transfer_account2)\""
+assert_balance test_transfer_account2 "120 ꜩ" # Why isn't this 120 ꜩ? Baking fee?
+
+# Test SELF
+init_with_transfer $contract_op_dir/self.tz $key1 \
+				   '"tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx"' 1,000 bootstrap1
+bake_after $client transfer 0 from bootstrap1 to self
+assert_storage_contains self "\"$(get_contract_addr self)\""
+
+# Test SLICE and SIZE on bytes
+init_with_transfer $contract_op_dir/slices.tz bootstrap1 \
+				   '"sppk7dBPqMPjDjXgKbb5f7V3PuKUrA4Zuwc3c3H7XqQerqPUWbK7Hna"' 1,000 bootstrap1
+
+assert_fails $client transfer 0 from bootstrap1 to slices -arg \
+        '(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "p2sigsceCzcDw2AeYDzUonj4JT341WC9Px4wdhHBxbZcG1FhfqFVuG7f2fGCzrEHSAZgrsrQWpxduDPk9qZRgrpzwJnSHC3gZJ")'
+assert_fails $client transfer 0 from bootstrap1 to slices -arg \
+        '(Pair 0xeaa9ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")'
+assert_fails $client transfer 0 from bootstrap1 to slices -arg \
+        '(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2deaad01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")'
+assert_fails $client transfer 0 from bootstrap1 to slices -arg \
+        '(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150733eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")'
+assert_fails $client transfer 0 from bootstrap1 to slices -arg \
+        '(Pair 0xe009ab79e8b84ef0 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")'
+assert_success $client transfer 0 from bootstrap1 to slices -arg \
+        '(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")'
+bake
+
+init_with_transfer $contract_op_dir/split_string.tz bootstrap1 '{}' 1,000 bootstrap1
+
+bake_after $client transfer 0 from bootstrap1 to split_string -arg '"abc"'
+assert_storage_contains split_string '{ "a" ; "b" ; "c" }'
+bake_after $client transfer 0 from bootstrap1 to split_string -arg '"def"'
+assert_storage_contains split_string '{ "a" ; "b" ; "c" ; "d" ; "e" ; "f" }'
+
+init_with_transfer $contract_op_dir/split_bytes.tz bootstrap1 '{}' 1,000 bootstrap1
+
+bake_after $client transfer 0 from bootstrap1 to split_bytes -arg '0xaabbcc'
+assert_storage_contains split_bytes '{ 0xaa ; 0xbb ; 0xcc }'
+bake_after $client transfer 0 from bootstrap1 to split_bytes -arg '0xddeeff'
+assert_storage_contains split_bytes '{ 0xaa ; 0xbb ; 0xcc ; 0xdd ; 0xee ; 0xff }'
+
+# Test hash consistency between Michelson and the CLI
+hash_result=`$client hash data '(Pair 22220000000 (Pair "2017-12-13T04:49:00Z" 034))' \
+                     of type '(pair mutez (pair timestamp int))' | grep Blake2b | sed 's/.*: *//'`
+
+assert_storage $contract_op_dir/hash_consistency_checker.tz '0x00' \
+              '(Pair 22220000000 (Pair "2017-12-13T04:49:00Z" 034))' "$hash_result"
+
+assert_storage $contract_op_dir/hash_consistency_checker.tz '0x00' \
+              '(Pair 22220000000 (Pair "2017-12-13T04:49:00+00:00" 34))' "$hash_result"
+
+
+printf "\nEnd of test\n"
+
+show_logs="no"