Split complex test, fixes