ROASTER-28: Added more tests