Project converted to library, added unit tests!