Most Stable Test Package - More Bug Fixes