Added tests to be completed