Added initial testing framework Take 2.