Changed some test frameworks