Tests and interface updated