changes for test (mostly changes to tests0