Renamed folders, updated test