Add tests and 3d capabilities