fix setup and tests