Adding test code and updating article

@kwalrath should be a clean merge and test. The article had minor updates.