Feature#testeroos

* Updated some codes