Basis of testing in place
More work on testing