Add tests #475