Improved tests (42)