fixing up the tests so old tests are not broken.