o Added tests for methods expand(int) and expand(int, int).
o Added some Javadoc
Minor formatting
Added mising Apache headers