Can remove a few testcases. I'm still counting around 20 failing and will update this file while working through the testcases.