Added getTypeID() and getTypeLabel().  Cleaned up the test.php page just a little bit.