New test interface

I don't know... Is it a better idea to not be sure the master terminated... Probably not...