add more logging and update tests