Add tests for the new User interface