I raised the Issue for the sin/cos fix required. I do not have time right now to fix it myself, so I will remove the workaround and create separate rewrite  test case that XFAILs.