Simplified tests a bit.