fixing tests for new stateless api