add debug logging and remove old TestValues references