Merge "Fixing interface classses and adding unit tests."