Refactor tests to match requirements