LPS-50423 Update unit tests