Add: few more tests