Added tests around other exposed functions