Feature/testing improvements