More work towards packaging + testing overhaul