Added registration test + some cleanup in settings