Migration test from isolation unit tests to unit tests
Added TODO file with the next steps