More tests, added expand capacity methods