Fixed Some Issues with Tests