Improved stability and test cases