Added new simplification rules. Deleted non-useful test.