Fix rebase fallout
Fix interfaces test