Add base suffix to base class
Use assertArrayEquals
Added copyright headers