[1863] Adding more tests