Added ThirtyEP360 and tests