remove through and replace with through2 for tests