merging master and updating for failing tests