Adds tests, improves eval_set code