Setup test and run environment

Conflicts resolved