Should fix api tests