Add tests for 5.5