rewrote the testing scripts