First additions to test build setup