Have a constant
Unuse the system test
Get rid of debug
Merge remote-tracking branch 'origin/db/sean'