Feature/tests update