changes to setup and testing