Added a few basic unit and integration tests