Increased test functionality.