improved tests to match new requirements