Included tests
Modified settings