Some new tests...