Tester updated, more organized