fund def argument fixes and tests