remove redundant tests; refactor names and eval method