Addig tests (now working well to a simple sample