Working on having a better test interface