- modified tests to match new requirements