We describe a technique to generate critical hazard-free tests for self-rimed control circuits build using a macro-module library, in a partial scan based DFT environment. We propose a 6 valued algebra to generate these rests which are guaranteed to be critical hazard free under an unbounded delay model. This algebra has been incorporated in a D-algorithm based automatic rest pattern generator.