fixes #1396; expand tests