Making few ajustments to the self_test plugin