improved testing setup
improved testing setup