Moved api resources up a level & fixed users tests