Skip to content
Add unit tests, refactor some functions