Updates for Article and test. Not finished yet.