Expanded tests a bit.