Apply for all options, readme and tests updated