merged in tests