more setup and tests modification