diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6c5f66278ad10023d0d483a11c3475d3567632f7..c2f6aab57493fdb3081cfabbdf276afbf3994229 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,7 +19,10 @@ include_directories( ${CMAKE_SOURCE_DIR} )
 add_definitions(-DLIBWCCL_TEST_DATA_DIR="${PROJECT_SOURCE_DIR}/")
 
 add_executable(tests
+	main.cpp
 	optest.cpp
+
+	ann_op.cpp
 	conditional.cpp
 	constant.cpp
 	context.cpp
@@ -31,7 +34,6 @@ add_executable(tests
 	getorth.cpp
 	isempty.cpp
 	logicalpredicates.cpp
-	main.cpp
 	mark.cpp
 	match.cpp
 	position.cpp
diff --git a/tests/ann_op.cpp b/tests/ann_op.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..3b24a010fcd54a6d59c87be9e9c2a06a3e8da6ad
--- /dev/null
+++ b/tests/ann_op.cpp
@@ -0,0 +1,126 @@
+#include <boost/test/unit_test.hpp>
+#include <boost/bind.hpp>
+#include <libcorpus2/ann/annotatedsentence.h>
+#include <libwccl/ops/functions/constant.h>
+
+#include <libwccl/ops/functions/bool/predicates/ann.h>
+#include <libwccl/ops/functions/bool/predicates/annsub.h>
+#include <libwccl/values/match.h>
+#include <libwccl/values/tokenmatch.h>
+
+#include "optest.h"
+
+using namespace Wccl;
+
+BOOST_AUTO_TEST_SUITE(ann_ann_sub)
+
+struct AnnSubFix : public Wccl::PositionFixture
+{
+	AnnSubFix()
+		: Wccl::PositionFixture(3),
+		as(boost::make_shared<Corpus2::AnnotatedSentence>()),
+		sc(as),
+		cx(sc, boost::make_shared<Variables>())
+	{
+		as->append(new Corpus2::Token(UnicodeString::fromUTF8("t1"), PwrNlp::Whitespace::Newline));
+		as->append(new Corpus2::Token(UnicodeString::fromUTF8("t2"), PwrNlp::Whitespace::Newline));
+		as->append(new Corpus2::Token(UnicodeString::fromUTF8("t3"), PwrNlp::Whitespace::Newline));
+		as->append(new Corpus2::Token(UnicodeString::fromUTF8("t4"), PwrNlp::Whitespace::Newline));
+		as->append(new Corpus2::Token(UnicodeString::fromUTF8("t5"), PwrNlp::Whitespace::Newline));
+		as->create_channel("ch1");
+		as->get_channel("ch1").set_segment_at(2, 1);
+		as->get_channel("ch1").set_segment_at(3, 1);
+		as->get_channel("ch1").set_head_at(3, true);
+	}
+
+	boost::shared_ptr<Corpus2::AnnotatedSentence> as;
+	SentenceContext sc;
+	Corpus2::Tagset tagset;
+	FunExecContext cx;
+};
+
+BOOST_FIXTURE_TEST_CASE(ann_not, AnnSubFix)
+{
+	boost::shared_ptr< Constant<Match> > m0, m1;
+	m0.reset(new Constant<Match>(Match(TokenMatch(pos_value(0)))));
+	m1.reset(new Constant<Match>(Match(TokenMatch(pos_value(1)))));
+	Ann a(m0, m1, "ch1");
+	boost::shared_ptr<const Bool> rv = a.apply(cx);
+	BOOST_REQUIRE(rv);
+	BOOST_CHECK(!*rv);
+	AnnSub as(m0, m1, "ch1");
+	rv = a.apply(cx);
+	BOOST_REQUIRE(rv);
+	BOOST_CHECK(!*rv);
+}
+
+BOOST_FIXTURE_TEST_CASE(ann_yes, AnnSubFix)
+{
+	boost::shared_ptr< Constant<Match> > m0, m1;
+	m0.reset(new Constant<Match>(Match(TokenMatch(pos_value(2)))));
+	m1.reset(new Constant<Match>(Match(TokenMatch(pos_value(3)))));
+	Ann a(m0, m1, "ch1");
+	boost::shared_ptr<const Bool> rv = a.apply(cx);
+	BOOST_REQUIRE(rv);
+	BOOST_CHECK(*rv);
+	AnnSub as(m0, m1, "ch1");
+	rv = as.apply(cx);
+	BOOST_REQUIRE(rv);
+	BOOST_CHECK(*rv);
+}
+
+BOOST_FIXTURE_TEST_CASE(ann_sub, AnnSubFix)
+{
+	boost::shared_ptr< Constant<Match> > m0, m1;
+	m0.reset(new Constant<Match>(Match(TokenMatch(pos_value(2)))));
+	m1.reset(new Constant<Match>(Match(TokenMatch(pos_value(2)))));
+	Ann a(m0, m1, "ch1");
+	boost::shared_ptr<const Bool> rv = a.apply(cx);
+	BOOST_REQUIRE(rv);
+	BOOST_CHECK(!*rv);
+	AnnSub as(m0, m1, "ch1");
+	rv = as.apply(cx);
+	BOOST_REQUIRE(rv);
+	BOOST_CHECK(*rv);
+}
+
+
+//------ to_string test cases -------
+
+BOOST_FIXTURE_TEST_CASE(ann_to_string, AnnSubFix)
+{
+	boost::shared_ptr< Constant<Match> > m0, m1;
+	m0.reset(new Constant<Match>(Match(TokenMatch(pos_value(0)))));
+	m1.reset(new Constant<Match>(Match(TokenMatch(pos_value(1)))));
+	Ann ann(m0, m1, "ch");
+	BOOST_CHECK_EQUAL("ann(TOK[0], TOK[1], \"ch\")", ann.to_string(tagset));
+}
+
+BOOST_FIXTURE_TEST_CASE(ann_to_string_one, AnnSubFix)
+{
+	boost::shared_ptr< Constant<Match> > m0, m1;
+	m0.reset(new Constant<Match>(Match(TokenMatch(pos_value(0)))));
+	m1.reset(new Constant<Match>(Match(TokenMatch(pos_value(1)))));
+	Ann ann(m0, "ch");
+	BOOST_CHECK_EQUAL("ann(TOK[0], \"ch\")", ann.to_string(tagset));
+}
+
+BOOST_FIXTURE_TEST_CASE(annsub_to_string, AnnSubFix)
+{
+	boost::shared_ptr< Constant<Match> > m0, m1;
+	m0.reset(new Constant<Match>(Match(TokenMatch(pos_value(0)))));
+	m1.reset(new Constant<Match>(Match(TokenMatch(pos_value(1)))));
+	AnnSub ann(m0, m1, "ch");
+	BOOST_CHECK_EQUAL("annsub(TOK[0], TOK[1], \"ch\")", ann.to_string(tagset));
+}
+
+BOOST_FIXTURE_TEST_CASE(annsub_to_string_one, AnnSubFix)
+{
+	boost::shared_ptr< Constant<Match> > m0, m1;
+	m0.reset(new Constant<Match>(Match(TokenMatch(pos_value(0)))));
+	m1.reset(new Constant<Match>(Match(TokenMatch(pos_value(1)))));
+	AnnSub ann(m0, "ch");
+	BOOST_CHECK_EQUAL("annsub(TOK[0], \"ch\")", ann.to_string(tagset));
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/positionpredicates.cpp b/tests/positionpredicates.cpp
index 8f631ef64cf8781de2c924feaf64ccc8e695aae4..f8917415b5419ea4568786ac48fe6e239444f057 100644
--- a/tests/positionpredicates.cpp
+++ b/tests/positionpredicates.cpp
@@ -13,7 +13,7 @@ using namespace Wccl;
 
 BOOST_AUTO_TEST_SUITE(position_predicates)
 
-		struct PosPredFix : public Wccl::PositionFixture
+struct PosPredFix : public Wccl::PositionFixture
 {
 	PosPredFix()
 		: Wccl::PositionFixture(),