Small changes to settings module for testing purposes