Add tests support, not tests yet