Added some builders to make tests easier also filtering methods to allow in code selection of results.