Added tests for Subject 1 and 2

Also updated the subject list to include NAPP and to be a static
variable . NOTE = Need to add the logic for the new NAPP field.