Updated some constants.
Updated doco.
Moved test directory.