Cleanup + HP article block test