Add test and input bag wrapping