fixed tests with latest changes