removes old/new style tests, re-add disabled tests as session 7+8