Working on parser factory and more tests.

Signed-off-by: Euan Torano <euantorano@gmail.com>