Renamed root package/improved tests