Added testing
Revised testing file