Add tests to pr 22