Add unit tests
Move to main