Updating tests and development Env.

Ready to merge...