Update tests to use class-based interface