Added Test and Simplify most