Fixing simple tests
Setting up a funding instruments class version that uses validations.