Optimization improvements and test cases