Fixed SelfTest