Added tests to two more functions