Improved env. conf. and fixed up the acceptance tests