Changing logging, removing additional log points from testing