Add tests and code for filling with specific quantity