ticket:2 Adeed few more tests