With test working now