Cleaned up setUp() a bit.