fix setup and testing