fix issues with tests