RichardH : Fixing require paths in tests