Updated Testing