Updated tests to improve regression detection