Framework core improved. Unit tests created and passed