Latest changes

[+] New tests