Stage 2 par Complete Test REQ

Last task need to be finalised and tested