Adds the logic to remove the Test/Draft subject. Closes #11