Tests migrated from isolation unit tests to unit tests