Added better test interface