Added more monitoring and fixed tests