Feature/decrease test runtime