Update tests to work with 4.2 and below