[rprog-week-4] Refactored tests