#1590 tests remaining