Merge pull request #123 from ChrisBr/fix_tests

fix failing tests
Extended porposal feature test