Added testing to the output
I am merging test with master