Refactored tests to support recent PR