More fixes in the tests. Confirmation testing done