merge drors tests to development