BK/BF/ENH (which one?): This test is rather tricky - I made it less conservative but hopefully not too much. The annoying thing is that using the @labile decorator made travis testing hang.