Added test flag and cleaned up some left over debugging