Improve dev and test environments