Simplified tests a bit more