Updated some stuff regarding test