Fix failures

Fed up with the two failing tests. The following should fix them hopefully.