Fixing parsing errors for various scenarios
Adding moar tests for the new helper/parser functions