Verified build, added basic unit tests