Added tests to my branch