Javadoc updates to the models.  Also factored ATest enums out with the rest of the enums