regex bugfix, test update, var rename