Add tests and apt