Skip to content

Add tests and refactor #529

Add tests and refactor

Add tests and refactor #529