Expanded inputs on put and take and added tests