Tidying up test names, and Callable -> callable