Refactor tests simplifier -> simplify
Merge some tests into new optimize test framework