New test set and tests