One more attempt at 1.8 compatible tests