#621 Fixed option values saving / getting tests