Finished settings feature and cuke tests