Changed Test Mechanism