Feature/missing tests