Add tests, better compatibility