More tests, moving towards testing with GEB as well