merged multiple tests, changed baseline images