Changed testing framework to work with new definitions.