Some test stuff updated