#576 Fixed broken tests; Removed IOptionValues interface, instead of it using IOptions