Continuing work on testing