Tests seem to be okay now