some changes to get tests running with last modifications