diff --git a/test/testServer.c b/test/testServer.c
index 9003cf2..adcd2b7 100644
--- a/test/testServer.c
+++ b/test/testServer.c
@@ -233,7 +233,7 @@ int main (int argc, char **argv)
 									if (ret == PSYC_PARSE_ENTITY)
 									{
 										packets[i].entity.lines++;
-										mod->flag = parsers[i].valueLength ?
+										mod->flag = psyc_getParseValueLength(&parsers[i]) ?
 											PSYC_MODIFIER_NEED_LENGTH : PSYC_MODIFIER_NO_LENGTH;
 									}
 									break;
@@ -246,7 +246,7 @@ int main (int argc, char **argv)
 
 								case PSYC_PARSE_COMPLETE:
 									printf("# Done parsing.\n");
-									packets[i].flag = parsers[i].contentLengthFound ?
+									packets[i].flag = psyc_isParseContentLengthFound(&parsers[i]) ?
 										PSYC_PACKET_NEED_LENGTH : PSYC_PACKET_NO_LENGTH;
 
 									psyc_setPacketLength(&packets[i]);
@@ -261,12 +261,12 @@ int main (int argc, char **argv)
 									if (verbose)
 										printf("# Insufficient data.\n");
 
-									contbytes = parsers[i].buffer.length - parsers[i].cursor;
+									contbytes = psyc_getParseRemainingLength(&parsers[i]);
 
 									if (contbytes > 0) // copy end of parsebuf before start of recvbuf
 									{
 										assert(recvbuf - contbytes >= buf); // make sure it's still in the buffer
-										memcpy(recvbuf - contbytes, parsebuf + parsers[i].cursor, contbytes);
+										memcpy(recvbuf - contbytes, psyc_getParseRemainingBuffer(&parsers[i]), contbytes);
 									}
 									ret = 0;
 									break;
diff --git a/test/testText.c b/test/testText.c
index 6ea51f7..9fd3c1f 100644
--- a/test/testText.c
+++ b/test/testText.c
@@ -36,7 +36,7 @@ int testText (char *template, size_t tmplen, char *buffer, size_t buflen, psycSt
 	do
 	{
 		ret = psyc_text(&state, getValue);
-		length += state.written;
+		length += psyc_getTextBytesWritten(&state);
 		switch (ret)
 		{
 			case PSYC_TEXT_INCOMPLETE: