Additional test support