Some fixes that make this a little more robust..
More weird tests