more logging and testing