Updated depends and imports for rcdk
Added unit test from bug report