System and test block not needed any more