Add tests, remove main