Fixed UTs to adapt to change package in commons->settings