Add tester and tests (#4144)