Added tests
Worked on tests