Updating from original test