Added more tests.
Refactored test dispenser.