test fixes given code modifications