closes #3303 and adds smaller test set