Updated test constants and test data
Added additional tracing