updated defaults, require f' when calling f'', updated tests accordingly