adapted tests to integrated code