Rework tests to get sample add tokens from helper
Change from private constructor to exception raising constructor to allow subclass instantiation