Convert some direct add_test calls to use the helper functions instead. Change-Id: I4f6b92e24804885c6b1449b21ae8efffd22ffdbf