Add tests
Refactor tests, rename test methods

[ci skip]