Fixed Unit tests. WIP on the build process.