added more data massaging for tests