Rename vars in 2d lib
Create single file to run tests
Rename test groups
Move serializer to lib
Rename 2d tests