Add and fix tests, also allow fields override in options