Separate some tests