Fixed Update error and completed tests