Initial test case for the DefaultDispenser and related changes