Finaly add tests