Merge "Adds parser tests and cleanup"