Some test and settings update