Added first unit and integration test