Fixed outoload in demo.
Extended some tests