Testing set up
Added tests