Added more compatibility tests