Additional test, further changes