Update build process
Add unit tests