merged in some tests