Reverted to original test now that things are working