cleaned up the tester interface for FACES-1618