Moving testes to Generic piece
Added Grid of pieces