Updated to repair errors in testing