Core 'loading' module updated
Unit tests added