Adding tests for parser and upgrading to timeout parser