Fixed up namespacing
Variabalizing all of our tests