updated tests, move more to base
finish centralizing class tests