Add settings and test mode