Keep the empty directories
Renamed test class as it's now testing more than just the simple
version.