Settings and Tests updated