Added user tests and underscores for key blacklisting