Clean up + changes in tests because of new sparrow version