[UPDATE] Added tests