Removed Extend function and improved tests