Changed some testing.