Merge pull request #6 from vietj/master

Improve the generic param tests
Changes now that options are interfaces
increased test timeouts