More work on testing