Added tests to this