Additional test codes