making tests work for 1.8.7