Minor cleanup tests including removing
unused refs, returning promises instead
of using a done callback etc

Move toggle label ids function to utils

Address minor review comments