Add unit tests
Clean up