copied all the tests for the other version - not very DRY, I know