Update unit tests to work with revamped/simplified API