#266 unit test changes