this should be removed. Also all of the framework tests should be grouped together.