Wrapped operations and added testing for errors and operations